From 8881c4be7a0d86de2341b489f3ad9e997cb6deb5 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期四, 06 一月 2022 16:01:30 +0800
Subject: [PATCH] bug
---
xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 16e6c10..5bd327e 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
@@ -315,7 +315,7 @@
// 鏍￠獙鏄惁宸插瓨鍦�
checkUserInfo(u.getUsername(), u.getMobile(), u.getEmail());
- u.setKey(u.getPassword());
+ u.setDescription(u.getPassword());
String encryptPass = new BCryptPasswordEncoder().encode(u.getPassword());
u.setPassword(encryptPass);
if (StrUtil.isNotBlank(u.getDepartmentId())) {
@@ -528,4 +528,17 @@
throw new XbootException("璇ユ墜鏈哄彿宸茶娉ㄥ唽");
}
}
+
+ @RequestMapping(value = "/findByType2", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍏ㄩ儴鐢ㄦ埛鏁版嵁")
+ public Result<List<User>> findByType2(int type) {
+
+ List<User> list = userService.findByType2(type);
+ // 娓呴櫎鎸佷箙涓婁笅鏂囩幆澧� 閬垮厤鍚庨潰璇彞瀵艰嚧鎸佷箙鍖�
+ entityManager.clear();
+ for (User u : list) {
+ u.setPassword(null);
+ }
+ return new ResultUtil<List<User>>().setData(list);
+ }
}
--
Gitblit v1.9.1