获取小区，楼栋，单元ID

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();
     }