导入修改

Administrator

2022-06-17 dc2e7030b0312910dfa7e88229eae96cc80f4501

 src/main/java/org/springblade/modules/FTP/DataHanlder.java

@@ -426,7 +426,7 @@
            if (result.getCode() == 200) {
               user.setReasonForLeav("");
               //直接去审查，审查异常则不新增
               //异步审查
               //审查
               User user1 = hanlder.checkUserExamineByCardNos(user);
               if (null!=user1){
                  if (user1.getExaminationType().equals("0")){
@@ -479,6 +479,10 @@
                  }
               }
            } else if (result.getCode() == 201) {
               User user1 = result.getUser();
               //更新
               result1.setCode(201);
               result1.setUserId(user1.getId());
            } else {
               //不新增,不修改
               //设置返回结果,以在其他单位存在
@@ -498,7 +502,7 @@


   /**
    * 异步审查新增的保安员,审查通过并生成保安员证编号
    * 审查新增的保安员,审查通过并生成保安员证编号
    * @param user0
    */
   public User checkUserExamineByCardNos(User user0){
@@ -787,15 +791,15 @@
         && null!=user.getSecuritynumber()
         && !user.getSecuritynumber().equals("")){
         //截取，这个范围的不校验
         String pre = user.getSecuritynumber().substring(0,6);
         String number = user.getSecuritynumber().substring(6);
         if (pre.equals("赣洪2022")){
            int num = Integer.parseInt(number);
            if (num>=21000 && num<=23000){
               user.setSecuritynumber(DesensitizedUtil.desensitizedSecurityNumber(user.getSecuritynumber()));
               return new Result(200,null,"",user);
            }
         }
//         String pre = user.getSecuritynumber().substring(0,6);
//         String number = user.getSecuritynumber().substring(6);
//         if (pre.equals("赣洪2022")){
//            int num = Integer.parseInt(number);
//            if (num>=21000 && num<=23000){
//               user.setSecuritynumber(DesensitizedUtil.desensitizedSecurityNumber(user.getSecuritynumber()));
//               return new Result(200,null,"",user);
//            }
//         }
         //持证，校验保安证编号是否合法
         SecurityPaper securityPaper = new SecurityPaper();
         securityPaper.setIdCardNo(user.getCardid());