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

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

@@ -412,8 +412,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 } else if (HouseTypeEnum.BIESHU.getCode().equals(houseType)) {
                     resultMap.put(UserConstant.HOUSE_TYPE_KEY, HouseTypeEnum.BIESHU.getName());
                 }
-
                 resultMap.put(UserConstant.HOME_ID, neighBorName.concat(buildName).concat(unitName).concat(doorName));
+
+                if(resultMap.containsKey("CATEGORY_CODE")){
+                    resultMap.put("CATEGORY_CODE_VALUE",resultMap.get("CATEGORY_CODE"));
+                }
+                if(resultMap.containsKey("DEMAND_NAME")){
+                    resultMap.put("CATEGORY_CODE",resultMap.get("DEMAND_NAME"));
+                }
             }
 
             if (resultMap.containsKey(UserConstant.GENDER)) {