From 46dee74c10dec50da88dbf7919fc33d783102d08 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Wed, 10 May 2023 17:50:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcNeighborHoodServiceImpl.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 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 038ad89a68..f6271ba3b9 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
@@ -629,16 +629,17 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
     private String getBuildingId(String customerId, ImportGeneralDTO info) {
         //根据小区ID和楼栋名获取楼栋信息
         IcBuildingDTO building = icBuildingService.getBuildingInfo(info.getNeighborHoodId(), info.getBuildingName());
+        if (StringUtils.isNotBlank(info.getBuildingLeaderType())){
+            if (info.getBuildingLeaderType().equals("楼长")){
+                info.setBuildingLeaderTypeNum("0");
+            }
+            if (info.getBuildingLeaderType().equals("单元长")){
+                info.setBuildingLeaderTypeNum("1");
+            }
+        }
         if (null != building) {
             info.setBuildingExistStatus(true);
-            if (StringUtils.isNotBlank(info.getBuildingLeaderType())){
-                if (info.getBuildingLeaderType().equals("楼长")){
-                    info.setBuildingLeaderTypeNum("0");
-                }
-                if (info.getBuildingLeaderType().equals("单元长")){
-                    info.setBuildingLeaderTypeNum("1");
-                }
-            }
+
             if (info.getBuildingUpdateStatus()){
                 if (info.getTotalUnitNum() < building.getTotalUnitNum()){
                     /**