Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop

# Conflicts:
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -549,7 +549,7 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/agency/getsonagencyid")
     Result<List<SonOrgResultDTO>> getSonAgencyId(@RequestParam("orgId")String orgId,@RequestParam("type")String type);
-    
+
 //    /icbuilding/{id}?id=demoData
 
     /**
@@ -577,6 +577,11 @@ public interface GovOrgOpenFeignClient {
     @PostMapping("/gov/org/customeragency/configcustomerareacode")
     Result configCustomerAreaCode(@RequestBody CustomerAreaCodeFormDTO formDTO);
 
+    @PostMapping("/gov/org/customergrid/getstaffgridlist")
+    Result<List<CustomerStaffGridResultDTO>> getStaffGridList(@RequestParam("customerId") String customerId,
+                                                              @RequestParam("orgId") String orgId,
+                                                              @RequestParam("orgType") String orgType);
+
     /**
      * @Author sun
      * @Description 查询组织、网格、小区、楼栋、单元、房屋信息
@@ -584,11 +589,6 @@ public interface GovOrgOpenFeignClient {
     @PostMapping(value = "/gov/org/customeragency/icresiuserorgmsg")
     Result<IcResiUserOrgMsgResultDTO> icResiUserOrgMsg(@RequestBody IcResiUserOrgMsgFormDTO formDTO);
 
-    @PostMapping("/gov/org/customergrid/getstaffgridlist")
-    Result<List<CustomerStaffGridResultDTO>> getStaffGridList(@RequestParam("customerId") String customerId,
-                                                              @RequestParam("orgId") String orgId,
-                                                              @RequestParam("orgType") String orgType);
-
     /**
      * 查询单元
      * @param id

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -370,6 +370,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "configCustomerAreaCode", formDTO);
     }
 
+    @Override
+    public Result<List<CustomerStaffGridResultDTO>> getStaffGridList(String customerId, String orgId, String orgType) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getStaffGridList",customerId, orgId, orgType);
+    }
+
     /**
      * @Author sun
      * @Description 查询组织、网格、小区、楼栋、单元、房屋信息
@@ -379,11 +384,6 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "icResiUserOrgMsg", formDTO);
     }
 
-
-    @Override
-    public Result<List<CustomerStaffGridResultDTO>> getStaffGridList(String customerId, String orgId, String orgType) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getStaffGridList",customerId, orgId, orgType);
-    }
     @Override
     public Result<IcBuildingUnitDTO> getUnitById(String id) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getUnitById", id);

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

@@ -534,7 +534,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     resultColumns,
                     finalSubTables,
                     staffInfoCacheResult.getAgencyId(),
-                    staffOrgPath,null, formDTO.getKeyword());
+                    staffOrgPath,null,
+                    formDTO.getKeyword());
             pageInfo.setTotal(CollectionUtils.isEmpty(list)?NumConstant.ZERO:list.size());
             pageInfo.setList(list);
         }
@@ -596,7 +597,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 }
                 resultMap.put(UserConstant.HOME_ID, neighBorName.concat(buildName).concat(unitName).concat(doorName));
 
-                // resultMap.put("CATEGORY_NAME",queryUserDemandName(formDTO.getCustomerId(),(String) resultMap.get("icResiUserId")));
+                resultMap.put("CATEGORY_NAME",queryUserDemandName(formDTO.getCustomerId(),(String) resultMap.get("icResiUserId")));
             }
 
             if (resultMap.containsKey(UserConstant.GENDER)) {