From 96b7ff3c83e5fc91e45d1eabacf84fdeb8449ef8 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 15 Feb 2022 17:50:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B0=8F=E5=8C=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=A5=BC=E6=A0=8B=EF=BC=8C=E5=8D=95=E5=85=83ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcNeighborHoodServiceImpl.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index 728a66978e..80e7774701 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -49,8 +49,6 @@ import com.epmet.dto.result.ImportResultDTO;
 import com.epmet.dto.result.InfoByNamesResultDTO;
 import com.epmet.entity.*;
 import com.epmet.excel.IcNeighborHoodExcel;
-import com.epmet.model.BuildingInfoModel;
-import com.epmet.model.ImportBuildingInfoListener;
 import com.epmet.model.ImportNeighborHoodInfoListener;
 import com.epmet.model.NeighborHoodInfoModel;
 import com.epmet.redis.IcHouseRedis;
@@ -475,7 +473,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
                 String neighborHoodId = getNeighborHoodId(formDTO.getCustomerId(), item);
                 item.setNeighborHoodId(neighborHoodId);
                 //2.获取楼栋ID，判断楼栋是否存在，不存在则添加楼栋，存在则直接获取楼栋ID
-                if (StringUtils.isEmpty(item.getBuildingId())) {
+                if (StringUtils.isEmpty(item.getBuildingId()) && StringUtils.isNotEmpty(item.getBuildingName())) {
                     String buildingId = getBuildingId(formDTO.getCustomerId(), item);
                     item.setBuildingId(buildingId);
                 }
@@ -524,6 +522,8 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         entity.setAgencyPids(info.getPids());
         entity.setGridId(info.getGridId());
         entity.setNeighborHoodName(info.getNeighborHoodName());
+        entity.setAddress(info.getAddress());
+        entity.setRemark(info.getRemark());
         baseDao.insert(entity);
         return entity.getId();
     }