From 58d959362cf2c4ce65a3413b1b1b7c1cb81f7470 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 31 May 2022 15:15:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcResiUserDao.java        | 6 ++++++
 .../com/epmet/service/impl/IcResiUserServiceImpl.java     | 2 ++
 .../src/main/resources/mapper/IcResiUserDao.xml           | 8 ++++++++
 3 files changed, 16 insertions(+)

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 23e59d3f13..76984ab822 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
@@ -49,6 +49,12 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      **/
     void add(@Param("tableName") String tableName, @Param("map") Map<String, String> map);
 
+    /**
+     * @Author sun
+     * @Description 居民信息修改先删除字表可能存在的数据
+     **/
+    void del(@Param("tableName") String tableName, @Param("resiUserId") String resiUserId);
+
     /**
      * @Author sun
      * @Description 更新或新增居民信息各表数据
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 6a14cc8ad9..5fadcdb35c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -408,6 +408,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                         hash.put("ic_resi_user", finalResiUserId);
                         hash.put("customer_id", tokenDto.getCustomerId());
                         hash.put("created_by", tokenDto.getUserId());
+                        //2022.5.31  bug修改【举例党员类别新增选是，修改为否，在修改为是时，此时字表id没值，实际有脏数据，导致字表新数据进不去】
+                        baseDao.del(d.getTableName(), finalResiUserId);
                         //字表新增数据
                         baseDao.add(d.getTableName(), hash);
                     } else {
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 6e7ea6f69b..d12491ad63 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
@@ -55,6 +55,14 @@
         )
     </insert>
 
+    <delete id="del">
+        DELETE
+        FROM
+            ${tableName}
+        WHERE
+            ic_resi_user = #{resiUserId}
+    </delete>
+
     <update id="upTable">
         UPDATE ${tableName}
         SET