From 05a1ed431f82c3d4fd455fceb8b8a039bcfbafec Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Fri, 16 Sep 2022 18:17:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/IcHouseServiceImpl.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 e304f23fa5..2a1b036570 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
@@ -10,6 +10,7 @@ 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.redis.common.bean.HouseInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -221,7 +222,13 @@ 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());
+            HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(item.getCustomerId(), item.getId());
+            if (null != houseInfo){
+                StringBuffer str = new StringBuffer();
+                str.append(houseInfo.getBuildingName()).append(houseInfo.getUnitName()).append(houseInfo.getDoorName());
+                dto.setHouseName(str.toString());
+            }
+
             return dto;
         }).collect(Collectors.toList());
     }