From d9da603305a2b94bde78483fa8777a43ee352548 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期二, 18 一月 2022 08:22:49 +0800
Subject: [PATCH] 违章记录
---
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 5bd327e..9ee757f 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
@@ -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());
@@ -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