修改bug

huanghongfa

2021-06-21 0710b9ffdc451ffbda32df66fb56d42df66e3ac5

修改bug

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -142,10 +142,7 @@
            List<PartyOrganizationVO> partyOrganizationVOArrayList=partyOrganizationVOS;
            list.forEach(partyBuildingMemberExcelVO -> {

                List<ComPbMemberDO> comPbMemberDOList = this.baseMapper.selectList(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getIdCard,partyBuildingMemberExcelVO.getIdCard()));
                if(!comPbMemberDOList.isEmpty()){
                    throw new PartyBuildingMemberException("导入失败，您导入的数据中有已存在的党员信息,已存在的数据:"+ partyBuildingMemberExcelVO.getEmploymentTime() + "，已存在的人名：" + partyBuildingMemberExcelVO.getName());
                }


                ComPbMemberDO comPbMemberDO=new ComPbMemberDO();
                Date date=new Date();
@@ -159,6 +156,14 @@
                    PartyOrganizationVO partyOrganizationVO = collect.get(0);
                    comPbMemberDO.setOrgId(partyOrganizationVO.getId());
                    comPbMemberDO.setCommunityId(partyOrganizationVO.getCommunityId());

                    List<ComPbMemberDO> comPbMemberDOList = this.baseMapper.selectList(new QueryWrapper<ComPbMemberDO>().lambda()
                            .eq(ComPbMemberDO::getIdCard,partyBuildingMemberExcelVO.getIdCard())
                            .eq(ComPbMemberDO::getCommunityId,partyOrganizationVO.getCommunityId())
                            .in(ComPbMemberDO::getAuditResult,0,1));
                    if(!comPbMemberDOList.isEmpty()){
                        throw new PartyBuildingMemberException("导入失败，您导入的数据中有已存在的党员信息,已存在的数据:"+ partyBuildingMemberExcelVO.getEmploymentTime() + "，已存在的人名：" + partyBuildingMemberExcelVO.getName());
                    }
                }

                if(!DateUtils.isValidDate(partyBuildingMemberExcelVO.getEmploymentTime())){