Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

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

@@ -501,23 +501,24 @@
      boolean status = userService.save(user);

      //头像
      if (null!=user.getAvatar() && !user.getAvatar().equals("")) {
         user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
      }

      String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,sex,role_id,dept_id,cardid," +
         "jurisdiction,examination_type,status,is_deleted) " +
         "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
         "'" + user.getPassword() + "'" + "," + "'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
         "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
         "," + "'" + user.getDeptId() + "'" +
         "," + "'" + user.getCardid() + "'" +
         "," + "'" + user.getJurisdiction() + "'" +
         "," + "'" + user.getExamination_type() + "'" +
         "," + "'" + user.getStatus() + "'" +
         "," + "'" + user.getIsDeleted() + "'" + ")";
//      if (null!=user.getAvatar() && !user.getAvatar().equals("")) {
//         user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
//      }
//
//      String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,sex,role_id,dept_id,cardid," +
//         "jurisdiction,examination_type,status,is_deleted) " +
//         "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
//         "'" + user.getPassword() + "'" + "," + "'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
//         "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
//         "," + "'" + user.getDeptId() + "'" +
//         "," + "'" + user.getCardid() + "'" +
//         "," + "'" + user.getJurisdiction() + "'" +
//         "," + "'" + user.getExamination_type() + "'" +
//         "," + "'" + user.getStatus() + "'" +
//         "," + "'" + user.getIsDeleted() + "'" + ")";
//      System.out.println(s);
      FtpUtil.sqlFileUpload(s);
//      FtpUtil.sqlFileUpload(s);
      return R.status(status);
   }
}
};