From d9411a6692197efabcf132d61c051e51cb85e219 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 11 三月 2026 13:33:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/UserController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 893868e..9cad12b 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -36,7 +36,9 @@
@RequestMapping(value = "/user/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(userService.getById(String.valueOf(id)));
+ User user = userService.getById(String.valueOf(id));
+ sanitizeUser(user);
+ return R.ok(user);
}
@RequestMapping(value = "/user/list/auth")
@@ -50,8 +52,11 @@
QueryWrapper<User> wrapper = new QueryWrapper<>();
convert(param, wrapper);
wrapper.orderBy(true, false, "id");
+ Page<User> page;
if (9527 == getUserId()) {
- return R.ok(userService.page(new Page<>(curr, limit), wrapper));
+ page = userService.page(new Page<>(curr, limit), wrapper);
+ sanitizeUsers(page.getRecords());
+ return R.ok(page);
}
Long roleId = getUser().getRoleId();
@@ -68,7 +73,9 @@
wrapper.notIn("role_id", leaderIds);
}
- return R.ok(userService.page(new Page<>(curr, limit), wrapper));
+ page = userService.page(new Page<>(curr, limit), wrapper);
+ sanitizeUsers(page.getRecords());
+ return R.ok(page);
}
private void convert(Map<String, Object> map, QueryWrapper wrapper){
@@ -134,6 +141,10 @@
wrapper.set("role_id", user.getRoleId());
needUpdate = true;
}
+ if (user.getStatus() != null) {
+ wrapper.set("status", user.getStatus());
+ needUpdate = true;
+ }
if (user.getMfaAllow() != null) {
int mfaAllow = normalizeMfaAllow(user.getMfaAllow());
wrapper.set("mfa_allow", mfaAllow);
@@ -168,6 +179,23 @@
.eq("id", user.getId())
.set("password", password));
userLoginService.remove(new QueryWrapper<UserLogin>().eq("user_id", user.getId()).eq("system_type", "WCS"));
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/user/resetPassword/auth")
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛閲嶇疆瀵嗙爜")
+ public R resetPassword(Long id, String password) {
+ if (id == null || Cools.isEmpty(password)) {
+ return R.error();
+ }
+ User user = userService.getById(id);
+ if (Cools.isEmpty(user)) {
+ return new R(10001, i18nMessageService.getMessage("response.user.notFound"));
+ }
+ userService.update(new UpdateWrapper<User>()
+ .eq("id", id)
+ .set("password", password));
+ userLoginService.remove(new QueryWrapper<UserLogin>().eq("user_id", id).eq("system_type", "WCS"));
return R.ok();
}
@@ -226,4 +254,21 @@
return Integer.valueOf(1).equals(mfaAllow) ? 1 : 0;
}
+ private void sanitizeUsers(List<User> users) {
+ if (users == null) {
+ return;
+ }
+ for (User user : users) {
+ sanitizeUser(user);
+ }
+ }
+
+ private void sanitizeUser(User user) {
+ if (user == null) {
+ return;
+ }
+ user.setPassword(null);
+ user.setMfaSecret(null);
+ }
+
}
--
Gitblit v1.9.1