1. 电子围栏基本接口新增 2. 保安员证核查申请记录基本接口新增，审批，批量审批接口编写 3. 保安员证档案库新增字段 source 来源，保安员证...

Administrator

2022-03-04 138cac5008689fadaa96ecac116a2297bb69bc1c

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

@@ -324,26 +324,26 @@
      }

      //判断是否持证
//      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;
//               }
//            }
//            if (!status){
//               throw new ServiceException("保安证编号不匹配,请核实!");
//            }
//         }else {
//            throw new ServiceException("保安证编号不匹配,请核实!");
//         }
//      }
      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;
               }
            }
            if (!status){
               throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
            }
         }else {
            throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
         }
      }

      //如果是离职
      if (null != user.getStatus()) {
@@ -1208,26 +1208,26 @@
      }

      //判断是否持证
//      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;
//               }
//            }
//            if (!status){
//               throw new ServiceException("保安证编号不匹配,请核实!");
//            }
//         }else {
//            throw new ServiceException("保安证编号不匹配,请核实!");
//         }
//      }
      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;
               }
            }
            if (!status){
               throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
            }
         }else {
            throw new ServiceException("保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
         }
      }

      String url = "";
      if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {