1109修改

101captain

2021-11-09 e7f03acfa5ee4ad4fd6d1ee9e9ae9a5655488f6d

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java

@@ -205,7 +205,13 @@
            if(!isOnly(memberExcel.getIdCard(),memberMap)){
                ComClusterMemberExcelErrorVO memberExcelErrorVO = new ComClusterMemberExcelErrorVO();
                BeanUtils.copyProperties(memberExcel,memberExcelErrorVO);
                memberExcelErrorVO.setError("该成员已存在");
                //判断该成员是否是已存在还是身份证号码重复
                ComClusterOrganizationMemberDO memberDO = (ComClusterOrganizationMemberDO)memberMap.get(memberExcel.getIdCard());
                if(memberDO.getName().equals(memberExcel.getName())){
                    memberExcelErrorVO.setError("该成员已存在");
                }else{
                    memberExcelErrorVO.setError("身份证号重复");
                }
                mistakes.add(memberExcelErrorVO);
                continue;
            }
@@ -239,6 +245,7 @@
            clusterMember.setNationCode(nationCode);
            clusterMember.setImageUrl(Constants.CLUSTER_MEMBER_DEFAULT_IMAGE_URL);
            clusterMember.setCreateAt(nowDate);
            clusterMember.setCommunityId(communityId);
            saveList.add(clusterMember);
            memberMap.put(clusterMember.getIdCard(),clusterMember);
        }