1109修改

101captain

2021-11-09 e7f03acfa5ee4ad4fd6d1ee9e9ae9a5655488f6d

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

@@ -81,9 +81,9 @@
        BeanUtils.copyProperties(addClusterMemberAdminDto,organizationMemberDO);
        organizationMemberDO.setCreateAt(new Date());
        if(this.baseMapper.insert(organizationMemberDO) > 0){
            return R.ok();
            return R.ok("添加成功");
        }
        return R.fail();
        return R.fail("添加失败");
    }

    /**
@@ -109,9 +109,9 @@
        BeanUtils.copyProperties(editClusterMemberAdminDto,organizationMemberDO);
        organizationMemberDO.setUpdateAt(new Date());
        if(this.baseMapper.updateById(organizationMemberDO) > 0){
            return R.ok();
            return R.ok("编辑成功");
        }
        return R.fail();
        return R.fail("编辑失败");
    }

    /**
@@ -126,9 +126,9 @@
        organizationMemberDO.setIsDel(ComClusterOrganizationMemberDO.isOk.yes);
        organizationMemberDO.setUpdateAt(new Date());
        if(this.baseMapper.updateById(organizationMemberDO) > 0){
            return R.ok();
            return R.ok("删除成功");
        }
        return R.fail();
        return R.fail("删除失败");
    }

    /**
@@ -205,13 +205,19 @@
            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;
            }

            //判断组织是否存在
            if(!isOnly(memberExcel.getClusterName(),clusterMap)){
            if(isOnly(memberExcel.getClusterName(),clusterMap)){
                ComClusterMemberExcelErrorVO memberExcelErrorVO = new ComClusterMemberExcelErrorVO();
                BeanUtils.copyProperties(memberExcel,memberExcelErrorVO);
                memberExcelErrorVO.setError("该组织在本社区不存在");
@@ -223,7 +229,7 @@
            }

            //判断民族是否存在
            if(!isOnly(memberExcel.getNation(),nationMap)){
            if(isOnly(memberExcel.getNation(),nationMap)){
                ComClusterMemberExcelErrorVO memberExcelErrorVO = new ComClusterMemberExcelErrorVO();
                BeanUtils.copyProperties(memberExcel,memberExcelErrorVO);
                memberExcelErrorVO.setError("您填写的民族不存在");
@@ -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);
        }