Merge branch 'dev_bugfix_ljj'

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -50,6 +50,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 更新或新增居民信息各表数据

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -553,6 +553,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 {

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