Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemDetailDTO.java

@@ -85,4 +85,9 @@ public class IcResiCollectMemDetailDTO implements Serializable {
      * 是否是党员
      */
     private String isParty;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
 }

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

@@ -362,7 +362,6 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
                 for(int i = 0 ; i < memberList.size() ; i++){
                     // 根据身份证号和房屋ID获取人员信息
                     IcResiUserEntity userIdCardEntity = queryOriginUserByIdCard(memberList.get(i).getIdNum(),icResiCollectEntity.getCustomerId());
-                    Map<String, IcResiUserEntity> userMap = queryOriginUserByHomeId(icResiCollectEntity.getHomeId(),icResiCollectEntity.getCustomerId());
                     if(userIdCardEntity != null){
                         // 已存在人员 人员房屋不一致（更新人员信息和变更记录）
                         updateUserInfo(icResiCollectEntity,memberList.get(i),true,formDTO,userIdCardEntity);
@@ -524,7 +523,8 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         userEntity.setYhzgx(icResiCollectMemDetailDTO.getRelationship());
         userEntity.setGzdw(icResiCollectMemDetailDTO.getWorkPlace());
         userEntity.setRemarks(icResiCollectMemDetailDTO.getRemark());
-        icResiUserDao.updateById(userEntity);
+        userEntity.setCustomerId(icResiCollectMemDetailDTO.getCustomerId());
+        icResiUserDao.insert(userEntity);
 
         //变更记录表
         IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity();