From 47d788e075c8a4a38cb171a3ed78820aada74e8f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 24 Nov 2021 20:03:10 +0800
Subject: [PATCH] 1.主要管理人接口修改 2.出资人修改 3.用户查询修改，保安员审查查询修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 45 +++++++++++++++++++--------------------------
1 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 90df3d4..e58b4eb 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -567,10 +567,8 @@
//获取user
User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")),User.class);
//判断是否为空
-// if (null!=user.getHold()){
- //持证
-// if (user.getHold().equals("1")){
- //分配保安角色
+
+ //分配保安角色
Role role = new Role();
role.setRoleAlias("保安");
Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
@@ -581,16 +579,7 @@
if (userCount > 0 && Func.isEmpty(user.getId())) {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
-// }
- //未持证
-// if (user.getHold().equals("2")){
-// //分配未持证保安角色
-// Role role = new Role();
-// role.setRoleAlias("未持证保安");
-// Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
-// user.setRoleId(oneRole.getId().toString());
-// }
-// }
+
//密码加密
if (Func.isNotEmpty(user.getPassword())) {
user.setPassword(DigestUtil.encrypt(user.getPassword()));
@@ -615,22 +604,26 @@
rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
}
String urla = "";
- String[] split = user.getAvatar().split(",");
- for (int i = 0; i < split.length; i++) {
- String s = split[i].substring(26, split[i].length());
- urla += FtpConstant.ip + s + ",";
+ if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
+ String[] split = user.getAvatar().split(",");
+ for (int i = 0; i < split.length; i++) {
+ String s = split[i].substring(26, split[i].length());
+ urla += FtpConstant.ip + s + ",";
+ }
+ String substring = urla.substring(0, urla.length() - 1);
+ user.setAvatar(substring);
}
- String substring = urla.substring(0, urla.length() - 1);
- user.setAvatar(substring);
String urlf = "";
- String[] splits = user.getFingerprint().split(",");
- for (int i = 0; i < splits.length; i++) {
- String s = splits[i].substring(26, splits[i].length());
- urlf += FtpConstant.ip + s + ",";
+ if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
+ String[] splits = user.getFingerprint().split(",");
+ for (int i = 0; i < splits.length; i++) {
+ String s = splits[i].substring(26, splits[i].length());
+ urlf += FtpConstant.ip + s + ",";
+ }
+ String substrings = urla.substring(0, urlf.length() - 1);
+ user.setFingerprint(substrings);
}
- String substrings = urla.substring(0, urlf.length() - 1);
- user.setFingerprint(substrings);
String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
"politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction,dispatch) " +
--
Gitblit v1.9.3