From 16ccd1699196f68ce59c12caa3ea98f989627218 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Fri, 16 Sep 2022 17:50:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E6=97=B6=E5=90=8D=E5=AD=97=E5=B8=A6?=
 =?UTF-8?q?'=E5=8D=95=E5=85=83'=E4=BA=8C=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/service/impl/HouseServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index bea7a77501..de8806a781 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/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();
     }
 

From e1ded8b49d2fb74b9158e99481ebd8a763e4de17 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Fri, 16 Sep 2022 18:00:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/IcHouseServiceImpl.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index 76df21476b..e304f23fa5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/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());
     }