党员导入可覆盖原有信息

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java

@@ -662,21 +662,6 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
             return;
         }
 
-        //判断党员是否已存在
-        LambdaQueryWrapper<IcPartyMemberEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(IcPartyMemberEntity::getCustomerId, customerId);
-        wrapper.eq(IcPartyMemberEntity::getIdCard, e.getIdCard());
-        IcPartyMemberEntity partyMember = baseDao.selectOne(wrapper);
-        if (null != partyMember) {
-            String message = "党员已存在";
-            IcPartyMemberImportExcel.RowRemarkMessage errorRow = new IcPartyMemberImportExcel.RowRemarkMessage();
-            errorRow.setName(name);
-            errorRow.setMobile(mobile);
-            errorRow.setIdCard(idCard);
-            errorRow.setErrorInfo(message);
-            otherRows.add(errorRow);
-            return;
-        }
         e.setCustomerId(customerId);
         e.setAgencyId(org.getAgencyId());
         e.setAgencyPids(org.getAgencyPids());
@@ -707,7 +692,18 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
         }
         e.setCreatedBy(currentUserId);
         e.setUpdatedBy(currentUserId);
-        baseDao.insert(e);
+        //判断党员是否已存在
+        LambdaQueryWrapper<IcPartyMemberEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcPartyMemberEntity::getCustomerId, customerId);
+        wrapper.eq(IcPartyMemberEntity::getIdCard, e.getIdCard());
+        IcPartyMemberEntity partyMember = baseDao.selectOne(wrapper);
+        if (null != partyMember) {
+            e.setId(partyMember.getId());
+            baseDao.updateById(e);
+        } else {
+            baseDao.insert(e);
+        }
+
     }
 
 }