保安员新增/修改保安证编号校验逻辑调整

Administrator

2022-03-07 fb2eb76b71b1a203ad226e802fc99a7a123acfc8

保安员新增/修改保安证编号校验逻辑调整

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -324,24 +324,27 @@
        }

        //判断是否持证
        boolean states = false;
        if (user.getHold().equals("1") && null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
            //持证，校验保安证编号是否合法
            SecurityPaper securityPaper = new SecurityPaper();
            securityPaper.setIdCardNo(user.getCardid());
            List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
            if (securityPaperList.size()>0){
                boolean status = false;
                //遍历
                for (SecurityPaper paper : securityPaperList) {
                    if (paper.getNumber().equals(user.getSecuritynumber())){
                        status = true;
                        states = true;
                    }
                }
                if (!status){
                    throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
                if (!states){
                    user.setHold("2");
//                    throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
                }
            }else {
                throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
//                throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
                states = false;
                user.setHold("2");
            }
        }

@@ -555,7 +558,10 @@
            //FtpUtil.sqlFileUpload(s1);
            myAsyncService.FTP(s1);
        }
        return R.success("修改成功");
        if (!states) {
            return R.data(201,null,"保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
        }
        return R.data(200,null,"修改成功!");
    }


@@ -1208,24 +1214,26 @@
        }

        //判断是否持证
        boolean state = false;
        if (user.getHold().equals("1")){
            //持证，校验保安证编号是否合法
            SecurityPaper securityPaper = new SecurityPaper();
            securityPaper.setIdCardNo(user.getCardid());
            List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
            if (securityPaperList.size()>0){
                boolean status = false;
                //遍历
                for (SecurityPaper paper : securityPaperList) {
                    if (paper.getNumber().equals(user.getSecuritynumber())){
                        status = true;
                        state = true;
                    }
                }
                if (!status){
                    throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
                if (!state){
                    user.setHold("2");
                    user.setSecuritynumber(null);
                }
            }else {
                throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
                user.setHold("2");
                user.setSecuritynumber(null);
            }
        }

@@ -1354,7 +1362,10 @@
//            }
//        }
        //判断是否持证是否为空
        return R.status(status);
        if (!state) {
            return R.data(201, null, "保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
        }
        return R.data(200,null,"新增成功!");
    }

    /**

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -1219,7 +1219,7 @@
        }
        if (!securityInvalidStatus.get()){
            String errorAccount = StringUtils.join(securityInvalidList, "\\\n");
            errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!!");
            errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
        }
        //抛出异常
        if (errorBuilder.length()>0){
@@ -1578,7 +1578,7 @@
        }
        if (!securityInvalidStatus.get()){
            String errorAccount = StringUtils.join(securityInvalidList, "\\\n");
            errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!!");
            errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
        }
        //抛出异常
        if (errorBuilder.length()>0){