From a3fd5d51c2704c235a7e93dd7844a89ee5c2dc96 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 1 Jun 2022 10:44:37 +0800
Subject: [PATCH] building

---
 .../service/impl/IcNeighborHoodServiceImpl.java  |  1 +
 .../src/main/resources/mapper/IcBuildingDao.xml  | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 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 7520503af6..c54ea3a436 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
@@ -604,6 +604,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
                      * 单元数可以修改变小，先去校验,单元下存在房屋就报错，不存在，删除对应单元，更新楼栋单元数
                      * 校验规则，单元号倒序，校验（原来的单元数 - 现在单元数）个单元下是不是存在房屋，存在房屋不能更新
                      */
+                    info.setBuildingId(building.getId());
                     Integer size = building.getTotalUnitNum() - info.getTotalUnitNum();
                     List<String> ids = icBuildingUnitDao.getUnitIdByBuildingId(building.getId(), size);
                     if (!org.springframework.util.CollectionUtils.isEmpty(ids)){
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 7e0d3bde18..92c486f24a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -48,10 +48,18 @@
         SET TOTAL_UNIT_NUM = #{totalUnitNum},
             TOTAL_FLOOR_NUM = #{totalFloorNum},
             TOTAL_HOUSE_NUM = #{totalHouseNum},
-            BUILDING_LEADER_NAME = #{buildingLeaderName},
-            BUILDING_LEADER_MOBILE = #{buildingLeaderMobile},
-            SORT = #{sort},
-            TYPE = #{type},
+            <if test="buildingLeaderName != null and buildingLeaderName != '' ">
+                BUILDING_LEADER_NAME = #{buildingLeaderName},
+            </if>
+            <if test="buildingLeaderMobile != null and buildingLeaderMobile != '' ">
+                BUILDING_LEADER_MOBILE = #{buildingLeaderMobile},
+            </if>
+            <if test="sort != null">
+                SORT = #{sort},
+            </if>
+            <if test="type != null and type != ''">
+                TYPE = #{type},
+            </if>
             UPDATED_TIME = NOW()
         WHERE ID = #{buildingId}
     </update>