Merge remote-tracking branch 'origin/dev_qr_code' into develop

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);
         }
     }
 }