From d0e24d6670a0d8f2bc623a7e6aa554bc2a472509 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 27 Jul 2022 17:03:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=AF=BC=E5=85=A5=E5=8F=AF?=
 =?UTF-8?q?=E8=A6=86=E7=9B=96=E5=8E=9F=E6=9C=89=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcPartyMemberServiceImpl.java        | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
index 2b0f70bade..e6e8fd9c44 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java
+++ b/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);
+        }
+
     }
 
 }
\ No newline at end of file