Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-10-21 4e45a8252d7bccd23a1a57aa541a2ea521760572

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -1130,6 +1130,9 @@
        if(Objects.nonNull(member.getCompanyType())){
            queryWrapper.eq(Company::getType,member.getCompanyType());
        }
        if(StringUtils.isNotBlank(member.getCompanyTypes())){
            queryWrapper.in(Company::getType,Arrays.asList(member.getCompanyTypes().split(",")));
        }
        if(null != member.getType()) {
            queryWrapper.eq(Member::getType,member.getType());
        }
@@ -1917,7 +1920,7 @@
            ,List<Company> companyList
            ,Integer companyType) {
        if(StringUtils.isBlank(model.getName())
                ||StringUtils.isBlank(model.getIdcardNo())
//                ||StringUtils.isBlank(model.getIdcardNo())
                ||StringUtils.isBlank(model.getPhone())
                ||StringUtils.isBlank(model.getCompanyName())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行人员信息不完整，请检查表格内容！");
@@ -1925,12 +1928,17 @@
        if (!PhoneUtil.isPhone(model.getPhone())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行手机号【"+model.getPhone()+"】格式不正确，请检查表格内容！");
        }
        if ( !isDebug && !IdcardUtil.isValidCard(model.getIdcardNo())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】格式不正确，请检查表格内容！");
        if(StringUtils.isNotBlank(model.getIdcardNo())){
            if ( !isDebug && !IdcardUtil.isValidCard(model.getIdcardNo())){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】格式不正确，请检查表格内容！");
            }
        }

        for(Member member: newList){
            if(StringUtils.equals(model.getIdcardNo(),member.getIdcardNo())){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】重复出现，请检查表格内容！");
            if(StringUtils.isNotBlank(model.getIdcardNo())&&StringUtils.isNotBlank(member.getIdcardNo())) {
                if (StringUtils.equals(model.getIdcardNo(), member.getIdcardNo())) {
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，第" + (index + 3) + "行身份证号【" + model.getIdcardNo() + "】重复出现，请检查表格内容！");
                }
            }
            if(StringUtils.equals(model.getPhone(),member.getPhone())){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行手机号【"+model.getPhone()+"】重复出现，请检查表格内容！");
@@ -1944,9 +1952,12 @@
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行组织名称【"+model.getCompanyName()+"】类型不正确，请检查表格内容！");
        }
        String candNo = DESUtil.encrypt(Constants.EDS_PWD, model.getIdcardNo());
        if(findMemberFromListByIdcard(candNo,memberList ) !=null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】已存在，请检查表格内容！");
        if(StringUtils.isNotBlank(model.getIdcardNo())){
            if(findMemberFromListByIdcard(candNo,memberList ) !=null){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行身份证号【"+model.getIdcardNo()+"】已存在，请检查表格内容！");
            }
        }

        if(findMemberFromListByPhone(model.getPhone(),memberList ) !=null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第"+(index+3)+"行手机号【"+model.getPhone()+"】已存在，请检查表格内容！");
        }