Merge branch 'yantai_zhengwu_master' into dev

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -629,8 +629,6 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
     private String getBuildingId(String customerId, ImportGeneralDTO info) {
         //根据小区ID和楼栋名获取楼栋信息
         IcBuildingDTO building = icBuildingService.getBuildingInfo(info.getNeighborHoodId(), info.getBuildingName());
-        if (null != building) {
-            info.setBuildingExistStatus(true);
         if (StringUtils.isNotBlank(info.getBuildingLeaderType())){
             if (info.getBuildingLeaderType().equals("楼长")){
                 info.setBuildingLeaderTypeNum("0");
@@ -639,6 +637,9 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
                 info.setBuildingLeaderTypeNum("1");
             }
         }
+        if (null != building) {
+            info.setBuildingExistStatus(true);
+
             if (info.getBuildingUpdateStatus()){
                 if (info.getTotalUnitNum() < building.getTotalUnitNum()){
                     /**