From caf3bdd9bbb629c8bc6f1a19b3ccdf441bf7650c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 15 三月 2026 17:46:47 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/system/controller/UserController.java |   68 ++++++++++++++++++++++++++++++----
 1 files changed, 60 insertions(+), 8 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..ccb1312 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,17 +73,21 @@
             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){
         for (Map.Entry<String, Object> entry : map.entrySet()){
-            if (entry.getKey().endsWith(">")) {
-                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
-            } else if (entry.getKey().endsWith("<")) {
-                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+            String val = String.valueOf(entry.getValue());
+            String column = humpToLine(entry.getKey());
+            if (val.contains(" - ")) {
+                String[] dates = val.split(" - ");
+                wrapper.ge(column, DateUtils.convert(dates[0]));
+                wrapper.le(column, DateUtils.convert(dates[1]));
             } else {
-                wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+                wrapper.like(column, val);
             }
         }
     }
@@ -134,6 +143,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 +181,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 +256,26 @@
         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);
+        user.setPasskeyCredentialId(null);
+        user.setPasskeyPublicKey(null);
+        user.setPasskeyAlgorithm(null);
+        user.setPasskeySignCount(null);
+        user.setPasskeyTransports(null);
+    }
+
 }

--
Gitblit v1.9.1