From 86149f80299be409dc86a057b7dffe813009cee9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 22 Mar 2022 11:05:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E9=9B=86=E4=BF=A1=E6=81=AF=EF=BC=9A?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E6=88=96=E8=80=85=E5=A7=93?=
 =?UTF-8?q?=E5=90=8D=E4=B8=8D=E4=B8=BA=E7=A9=BA=E6=97=B6=E6=8F=92=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcResiCollectServiceImpl.java        | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
index e59318dbd6..b1895b608a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
@@ -63,8 +63,11 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
             baseDao.insert(insert);
             List<IcResiMemberEntity> memberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class);
             memberList.forEach(mem -> {
-                mem.setIcResiCollectId(insert.getId());
-                icResiMemberDao.insert(mem);
+                if (StringUtils.isNotBlank(mem.getName()) || StringUtils.isNotBlank(mem.getIdNum())) {
+                    //姓名或份身份证号不为空时插入
+                    mem.setIcResiCollectId(insert.getId());
+                    icResiMemberDao.insert(mem);
+                }
             });
         } else {
             //更新主表
@@ -125,16 +128,21 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
 
     private void saveOrUpdateMem(List<IcResiMemberEntity> newMemberList, Map<String, IcResiMemberEntity> memMap, String originIcResiCollectId) {
         for (IcResiMemberEntity entity : newMemberList) {
-            if (MapUtils.isNotEmpty(memMap) && memMap.containsKey(entity.getIdNum())) {
+            if(StringUtils.isNotBlank(entity.getIdNum())){
+                if (MapUtils.isNotEmpty(memMap) && memMap.containsKey(entity.getIdNum())) {
+                    entity.setIcResiCollectId(originIcResiCollectId);
+                    entity.setCustomerId(memMap.get(entity.getIdNum()).getCustomerId());
+                    entity.setId(memMap.get(entity.getIdNum()).getId());
+                    icResiMemberDao.updateById(entity);
+                    continue;
+                }
+            }
+            //与之前历史成员没有匹配到
+            if (StringUtils.isNotBlank(entity.getName()) || StringUtils.isNotBlank(entity.getIdNum())) {
+                //姓名或份身份证号不为空时插入
                 entity.setIcResiCollectId(originIcResiCollectId);
-                entity.setCustomerId(memMap.get(entity.getIdNum()).getCustomerId());
-                entity.setId(memMap.get(entity.getIdNum()).getId());
-                icResiMemberDao.updateById(entity);
-                continue;
+                icResiMemberDao.insert(entity);
             }
-            //没有插入
-            entity.setIcResiCollectId(originIcResiCollectId);
-            icResiMemberDao.insert(entity);
         }
     }
 }