From 9c1d7ce35cc8c7dc81e0b259fb3b52211aa2f1bf Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期三, 09 二月 2022 13:55:11 +0800
Subject: [PATCH] bug
---
xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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..237ca33 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())) {
@@ -355,9 +355,9 @@
if (!old.getMobile().equals(u.getMobile()) && userService.findByMobile(u.getMobile()) != null) {
return ResultUtil.error("璇ユ墜鏈哄彿宸茬粦瀹氬叾浠栬处鎴�");
}
- if (!old.getEmail().equals(u.getEmail()) && userService.findByEmail(u.getEmail()) != null) {
- return ResultUtil.error("璇ラ偖绠卞凡缁戝畾鍏朵粬璐︽埛");
- }
+// if (!old.getEmail().equals(u.getEmail()) && userService.findByEmail(u.getEmail()) != null) {
+// return ResultUtil.error("璇ラ偖绠卞凡缁戝畾鍏朵粬璐︽埛");
+// }
if (StrUtil.isNotBlank(u.getDepartmentId())) {
Department d = departmentService.get(u.getDepartmentId());
@@ -521,11 +521,28 @@
if (StrUtil.isNotBlank(username) && userService.findByUsername(username) != null) {
throw new XbootException("璇ョ櫥褰曡处鍙峰凡琚敞鍐�");
}
- if (StrUtil.isNotBlank(email) && userService.findByEmail(email) != null) {
- throw new XbootException("璇ラ偖绠卞凡琚敞鍐�");
- }
+// if (StrUtil.isNotBlank(email) && userService.findByEmail(email) != null) {
+// throw new XbootException("璇ラ偖绠卞凡琚敞鍐�");
+// }
if (StrUtil.isNotBlank(mobile) && userService.findByMobile(mobile) != null) {
throw new XbootException("璇ユ墜鏈哄彿宸茶娉ㄥ唽");
}
}
+
+ @RequestMapping(value = "/findByType2", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍏ㄩ儴鐢ㄦ埛鏁版嵁")
+ public Result<List<User>> findByType2(int type) {
+
+ List<User> list = userService.findByType2(type);
+ // 娓呴櫎鎸佷箙涓婁笅鏂囩幆澧� 閬垮厤鍚庨潰璇彞瀵艰嚧鎸佷箙鍖�
+ List<User> list1 = new ArrayList<User>();
+ entityManager.clear();
+ for (User u : list) {
+ u.setPassword(null);
+ if (u.getType()==0){
+ list1.add(u);
+ }
+ }
+ return new ResultUtil<List<User>>().setData(list1);
+ }
}
--
Gitblit v1.9.1