From e43fc041656dcd446143cf40e3c20b2bd9f5d11c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 27 五月 2024 09:15:29 +0800
Subject: [PATCH] bug
---
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
index 1969829..70d20be 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -52,7 +52,7 @@
@RequestMapping(value = "/page/list", method = RequestMethod.POST)
public RestResponse<PageInfo<UserResponseVM>> pageList(@RequestBody UserPageRequestVM model) {
- model.setDepartmentId(isDeptAdmin() ? getAdminDeptIds() : null);
+ model.setDepartmentId(ObjectUtils.isNotEmpty(model.getDepartmentId()) ? model.getDepartmentId() : getAdminDeptIds());
PageInfo<User> pageInfo = userService.userPage(model);
PageInfo<UserResponseVM> page = PageInfoHelper.copyMap(pageInfo, d ->
UserResponseVM.from(d));
@@ -156,7 +156,6 @@
}}
).collect(Collectors.toList()));
}
- user.setDeptIds(model.getDeptIds());
return RestResponse.ok(user);
}
@@ -228,12 +227,6 @@
}
return RestResponse.ok();
- }
-
- @RequestMapping(value = "/setStatus", method = RequestMethod.POST)
- public RestResponse<String> setStatus(@RequestBody UserVO user) {
- userService.setStatus(user);
- return RestResponse.ok("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.8.0