From d856a33edb8372bc0af44489947b6cdd66ef1a1c Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Sun, 23 Apr 2023 21:15:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=8F=AA=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=B7=B2=E5=A1=AB=E5=86=99=E7=9A=84=E3=80=81=EF=BC=88?=
 =?UTF-8?q?=E6=84=8F=E6=80=9D=E5=B0=B1=E6=98=AF=EF=BC=8C=E4=B8=8A=E6=AC=A1?=
 =?UTF-8?q?=E6=88=91=E5=A1=AB=E4=BA=86=E7=AC=AC=E4=B8=80=E5=88=97=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E5=88=97=EF=BC=8C=E6=8F=90=E4=BA=A4=E4=BA=86=E3=80=82?=
 =?UTF-8?q?=E8=BF=99=E6=AC=A1=E6=88=91=E5=8F=AA=E5=A1=AB=E4=BA=86=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E7=AC=AC=E5=9B=9B=E5=88=97=EF=BC=8C=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E5=88=97=E7=A9=BA=E7=9D=80=EF=BC=8C=E9=82=A3?=
 =?UTF-8?q?=E8=BF=99=E6=AC=A1=E6=88=91=E5=AF=BC=E5=85=A5=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?4=E5=88=97=E9=83=BD=E6=9C=89=E5=80=BC=EF=BC=8C=E8=80=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=98=AF=E6=8A=8A1=EF=BC=8C2=E5=88=97=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=B8=BA=E7=A9=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcResiUserDao.java  | 11 +++++++++++
 .../service/impl/IcResiUserImportServiceImpl.java   |  6 +++---
 .../src/main/resources/mapper/IcResiUserDao.xml     | 13 +++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index 9930c7338f..dba99aadfa 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -61,6 +61,17 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      **/
     void upTable(@Param("tableName") String tableName, @Param("id") String id, @Param("map") Map<String, ?> map);
 
+    /**
+     * @description: 选择性更新（只更新不为null的）
+     * @param tableName:
+     * @param id:
+     * @param map:
+     * @return
+     * @author: WangXianZhang
+     * @date: 2023/4/23 9:03 PM
+     */
+    void updateTableSelective(@Param("tableName") String tableName, @Param("id") String id, @Param("map") Map<String, ?> map);
+
     List<Map<String, Object>> selectListResiMap(@Param("customerId") String customerId,
                                                 @Param("formCode") String formCode,
                                                 @Param("conditions") List<ResiUserQueryValueDTO> conditions,
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index 05e7b81853..e0b5c91837 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -547,7 +547,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
                 if (existingResiMap != null) {
                     // 修改居民信息
-                    icResiUserDao.upTable(tableName, existingResiMap.get("ID"), columnAndValues);
+                    icResiUserDao.updateTableSelective(tableName, existingResiMap.get("ID"), columnAndValues);
 
                     // 任意组织维度一个发生变化，则放到调动居民缓存中
                     ResiImportChangedData transferData;
@@ -747,7 +747,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 if (CollectionUtils.isNotEmpty(subInfos)) {
                     Map<String, Object> subInfo = subInfos.get(0);
                     // 附加信息存在，更新附加表内容
-                    icResiUserDao.upTable(targetTableName, subInfo.get("ID").toString(), columnAndValues);
+                    icResiUserDao.updateTableSelective(targetTableName, subInfo.get("ID").toString(), columnAndValues);
                 } else {
                     // 新增附加表信息
                     columnAndValues.put("CREATED_BY", currentUserId);
@@ -1577,7 +1577,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     private void updateMainTableResiTypeFlag(IcResiUserTableEnum icResiUserTableEnum, String resiUserId) {
         HashMap<String, Boolean> map = new HashMap<>();
         map.put(icResiUserTableEnum.getMainTableFlagColumnName(), true);
-        icResiUserDao.upTable(IcResiUserTableEnum.IC_RESI_USER.getTableName(), resiUserId, map);
+        icResiUserDao.updateTableSelective(IcResiUserTableEnum.IC_RESI_USER.getTableName(), resiUserId, map);
     }
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 2d2e30535f..118c0c3c36 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -73,6 +73,19 @@
         WHERE id = #{id}
     </update>
 
+    <!-- 选择性更新（只更新不为null的） -->
+    <update id="updateTableSelective">
+        UPDATE ${tableName}
+        SET
+        <foreach collection="map.entrySet()" index="key" item="value" separator=",">
+            <if test="value != null and value != ''">
+                ${key} = #{value}
+            </if>
+        </foreach>
+        ,UPDATED_TIME = NOW()
+        WHERE id = #{id}
+    </update>
+
 
     <select id="selectListMapById" parameterType="map" resultType="map">
         select * from ic_resi_user where del_flag='0' and id=#{icResiUserId} and customer_id=#{customerId}