进入网格时查询当前用户的身份，热心居民是网格级别的，党员与认证居民是无级别的

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java

@@ -25,7 +25,7 @@ import java.util.List;
  * @Author sun
  * , url = "localhost:8095"
  */
-@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class, url = "http://localhost:8095")
+@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class)
 public interface ResiGroupFeignClient {
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -168,8 +168,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userRoleFormDTO.setCustomerId(myResiUserInfoFormDTO.getCustomerId());
             userRoleFormDTO.setGridId(myResiUserInfoFormDTO.getGridId());
             result.setRoleList(userRoleDao.getUserRoleList(userRoleFormDTO));
-            userRoleDao.getUserRoleList(userRoleFormDTO);
-            userRoleDao.getUserRoleList(userRoleFormDTO);
             return result;
         }
 

epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml

@@ -17,6 +17,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!-- 如果没有传gridId只查用户的非网格级别的身份 -->
     <select id="getUserRoleInfo" parameterType="com.epmet.dto.form.UserRoleFormDTO"
             resultType="com.epmet.dto.result.UserRoleResultDTO">
 
@@ -33,33 +34,24 @@
             ur.DEL_FLAG = 0
             AND
             ur.USER_ID = #{userId}
-            <if test='null != app and "" != app'>
-                AND
-                er.APP = #{app}
-            </if>
-            <if test='null != customerId and "" != customerId'>
-                AND
-                ur.CUSTOMER_ID = #{customerId}
-            </if>
             <if test='null != gridId and "" != gridId'>
-                AND
+                AND( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' )
-                ( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' )
             </if>
-            <if test='null == gridId or "" == gridId'>
+            <if test='gridId == null or gridId = ""'>
-                AND
+                AND ur.GRID_ID = 'all'
-                ur.GRID_ID = 'all'
             </if>
         </where>
 
     </select>
 
+    <!-- 如果没有传gridId只查用户的非网格级别的身份 -->
     <select id="getUserRoleList" parameterType="com.epmet.dto.form.UserRoleFormDTO"
             resultType="string">
 
         SELECT
         DISTINCT
 
-        er.ROLE_KEY
+        er.ROLE_NAME
         FROM
         USER_ROLE ur
         JOIN EPMET_ROLE er ON ur.ROLE_ID = er.ID
@@ -69,21 +61,11 @@
             ur.DEL_FLAG = 0
             AND
             ur.USER_ID = #{userId}
-            <if test='null != app and "" != app'>
-                AND
-                er.APP = #{app}
-            </if>
-            <if test='null != customerId and "" != customerId'>
-                AND
-                ur.CUSTOMER_ID = #{customerId}
-            </if>
             <if test='null != gridId and "" != gridId'>
-                AND
+                AND( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' )
-                ( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' )
             </if>
-            <if test='null == gridId or "" == gridId'>
+            <if test='gridId == null or gridId = ""'>
-                AND
+                AND ur.GRID_ID = 'all'
-                ur.GRID_ID = 'all'
             </if>
         </where>