Merge branch 'dev_renwu700_syc'

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -210,7 +210,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         IcBuildingUnitDTO icBuildingUnit = icBuildingUnitService.get(formDTO.getBuildingUnitId());
         String doorName = formDTO.getDoorName();
         String buildingName = Optional.ofNullable(icBuilding).map(u -> u.getBuildingName()).orElse("");
-        String unitName = Optional.ofNullable(icBuildingUnit).map(u -> u.getUnitNum()).orElse("");
+        String unitName = Optional.ofNullable(icBuildingUnit).map(u -> u.getUnitName()).orElse("");
         return new StringBuilder().append(buildingName).append("-").append(unitName).append("-").append(doorName).toString();
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@@ -9,6 +9,7 @@ import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -220,6 +221,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
                 categories.add(NumConstant.ZERO, categories.remove(a));
             }
             dto.setCategoryList(categories);
+            dto.setHouseName(CustomerIcHouseRedis.getHouseInfo(item.getCustomerId(), item.getId()).getHouseName());
             return dto;
         }).collect(Collectors.toList());
     }