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 | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 05710e4..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
@@ -521,9 +521,9 @@
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("璇ユ墜鏈哄彿宸茶娉ㄥ唽");
}
@@ -535,10 +535,14 @@
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(list);
+ return new ResultUtil<List<User>>().setData(list1);
}
}
--
Gitblit v1.9.1