ftp 修改，新增保安员培训报名校验，新增押运员批量导入校验，批量导入保安员优化

Administrator

2022-04-29 dacafac0449f8df3ef7637a7ed05fa6270964f16

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

@@ -1133,6 +1133,7 @@
   @GetMapping("/security-apply-tree")
   public R<List<TreeNode>> securityApplyTree(UserVO user) {
      List<TreeNode> tree = userService.getSecurityApplyTree(user);
      System.out.println("tree = " + tree);
      return R.data(tree);
   }

@@ -1389,7 +1390,8 @@
      Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
      user.setRoleId(oneRole.getId().toString());
      user.setDispatch("1");
      user.setExaminationType("0");
      //待审查
      user.setExaminationType("2");
      user.setAccount(user.getRealName());
      user.setStatus(1);

@@ -1552,7 +1554,6 @@
            "," + "'" + experience.getCompanyname() + "'" +
            "," + "'" + experience.getSecurityid() + "'"
            + ")";
         //FtpUtil.sqlFileUpload(s);
         myAsyncService.FTP(s);
      }
   }
@@ -1595,7 +1596,6 @@
      if (null != user1.getFingerprint() && !user1.getFingerprint().equals("")) {
         //url 转base64
         String base64Url = ImageUtils.imageUrlToBase64(user1.getFingerprint());
         System.out.println("base64Url = " + base64Url);
         user1.setFingerprint(base64Url);
      }
      return R.data(user1);