Merge branch 'test' into 'test_bak'

罗元桥

2021-10-09 1f9c0e8663d2b7b59d03caf9257afb7526a88ec3

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