From 2e830efbe694a3d328251b41690dc685a6e080ea Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 27 五月 2024 09:51:30 +0800
Subject: [PATCH] feat：修改用户时返回密码
---
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 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..49a14b9 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));
@@ -96,6 +96,7 @@
}
userVm.setDeptIds(deptIds.equals("") ? "" : deptIds.substring(0,deptIds.length()-1));
userVm.setTagIds(tagService.selectTagIdsByUserId(user.getId()));
+ userVm.setPassword(authenticationService.pwdDecode(user.getPassword()));
return RestResponse.ok(userVm);
}
@@ -141,10 +142,10 @@
userService.updateByIdFilter(user);
}
userDepartmentMapper.removeByUserId(user.getId());
- for (String s : model.getDeptIds().split(",")) {
+ for (Integer s : model.getDeptIds()) {
UserDepartment userDepartment = new UserDepartment();
userDepartment.setUserId(user.getId());
- userDepartment.setDepartmentId(Integer.parseInt(s));
+ userDepartment.setDepartmentId(s);
userDepartmentMapper.insert(userDepartment);
}
if (ObjectUtils.isNotEmpty(model.getTagIds())) {
@@ -156,7 +157,6 @@
}}
).collect(Collectors.toList()));
}
- user.setDeptIds(model.getDeptIds());
return RestResponse.ok(user);
}
@@ -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