From 60f7a6e97197391393cbb3003d0eca3783467796 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 27 Apr 2022 14:22:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcHouseDTO.java               | 1 +
 .../main/java/com/epmet/service/impl/IcHouseServiceImpl.java  | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java
index 755d3ff086..2b48157889 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java
@@ -48,6 +48,7 @@ public class IcHouseDTO implements Serializable {
      * 小区id
      */
 	private String neighborHoodId;
+    private String neighborHoodName;
 
     /**
      * 片区id，neighbor_hood_part.id,可为空。
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 c2ca4fba8e..20bea1a301 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
@@ -95,9 +95,11 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
 
         HouseInfoDTO houseInfo = icHouseRedis.getHouseInfo(id, dto.getCustomerId());
         if (null != houseInfo) {
-            dto.setBuildingName(houseInfo.getNeighborHoodName().concat(houseInfo.getBuildingName()));
+            dto.setNeighborHoodName(houseInfo.getNeighborHoodName());
+            dto.setBuildingName(houseInfo.getBuildingName());
             dto.setUnitName(houseInfo.getUnitName());
         } else {
+            dto.setNeighborHoodName(StrConstant.EPMETY_STR);
             dto.setBuildingName(StrConstant.EPMETY_STR);
             dto.setUnitName(StrConstant.EPMETY_STR);
         }