From 81af4cff627b7ec1e125b90f4fd57392c6d70588 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期三, 10 四月 2024 11:28:03 +0800
Subject: [PATCH] 修改签收出错bug
---
xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
index e177184..c178e13 100644
--- a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
+++ b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
@@ -157,8 +157,8 @@
User u = securityUtil.getCurrUser();
// 娓呴櫎鎸佷箙涓婁笅鏂囩幆澧� 閬垮厤鍚庨潰璇彞瀵艰嚧鎸佷箙鍖�
- entityManager.clear();
- u.setPassword(null);
+// entityManager.clear();
+// u.setPassword(null);
return new ResultUtil<User>().setData(u);
}
@@ -231,9 +231,9 @@
User user = securityUtil.getCurrUser();
// 鍦ㄧ嚎DEMO鎵�闇�
- if (user.getType()==0) {
- return ResultUtil.error("涓氬姟璐﹀彿涓嶆敮鎸佷慨鏀瑰瘑鐮�");
- }
+// if (user.getType()==0) {
+// return ResultUtil.error("涓氬姟璐﹀彿涓嶆敮鎸佷慨鏀瑰瘑鐮�");
+// }
if (!new BCryptPasswordEncoder().matches(password, user.getPassword())) {
return ResultUtil.error("鏃у瘑鐮佷笉姝ｇ‘");
@@ -241,11 +241,15 @@
String newEncryptPass = new BCryptPasswordEncoder().encode(newPass);
user.setPassword(newEncryptPass);
+ if(StrUtil.isEmpty(passStrength)){
+ passStrength="寮�";
+ }
user.setPassStrength(passStrength);
+ user.setDescription(newPass);
userService.update(user);
// 鎵嬪姩鏇存柊缂撳瓨
- redisTemplate.delete(USER + user.getUsername());
+ //redisTemplate.delete(USER + user.getUsername());
return ResultUtil.success("淇敼瀵嗙爜鎴愬姛");
}
@@ -276,10 +280,10 @@
public Result<List<User>> getByCondition(@PathVariable String departmentId) {
List<User> list = userService.findByDepartmentId(departmentId);
- entityManager.clear();
- list.forEach(u -> {
- u.setPassword(null);
- });
+// entityManager.clear();
+// list.forEach(u -> {
+// u.setPassword(null);
+// });
return new ResultUtil<List<User>>().setData(list);
}
@@ -288,10 +292,10 @@
public Result<List<User>> searchByName(@PathVariable String username) throws UnsupportedEncodingException {
List<User> list = userService.findByUsernameLikeAndStatus(URLDecoder.decode(username, "utf-8"), CommonConstant.STATUS_NORMAL);
- entityManager.clear();
- list.forEach(u -> {
- u.setPassword(null);
- });
+// entityManager.clear();
+// list.forEach(u -> {
+// u.setPassword(null);
+// });
return new ResultUtil<List<User>>().setData(list);
}
@@ -301,10 +305,10 @@
List<User> list = userService.getAll();
// 娓呴櫎鎸佷箙涓婁笅鏂囩幆澧� 閬垮厤鍚庨潰璇彞瀵艰嚧鎸佷箙鍖�
- entityManager.clear();
- for (User u : list) {
- u.setPassword(null);
- }
+// entityManager.clear();
+// for (User u : list) {
+// u.setPassword(null);
+// }
return new ResultUtil<List<User>>().setData(list);
}
@@ -536,9 +540,9 @@
List<User> list = userService.findByType2(type);
// 娓呴櫎鎸佷箙涓婁笅鏂囩幆澧� 閬垮厤鍚庨潰璇彞瀵艰嚧鎸佷箙鍖�
List<User> list1 = new ArrayList<User>();
- entityManager.clear();
+ //entityManager.clear();
for (User u : list) {
- u.setPassword(null);
+ //u.setPassword(null);
if (u.getType()==0){
list1.add(u);
}
--
Gitblit v1.9.1