From 00fe3336b89c3c24ffe2826f45419d8e7dbb17fc Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 23 五月 2024 15:46:57 +0800
Subject: [PATCH] feat：统计新需求
---
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 8 +-------
1 files changed, 1 insertions(+), 7 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..8b9b82d 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));
@@ -228,12 +228,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