From 3215e24a462ee364ead6709b0ef238b1f43015c4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 21 二月 2024 16:15:14 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
index d16855d..2d39a81 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
@@ -36,6 +36,14 @@
     }
 
     @PreAuthorize("hasAuthority('system:user:list')")
+    @PostMapping("/user/page1")
+    public R page1(@RequestBody Map<String, Object> map) {
+        BaseParam baseParam = buildParam(map, BaseParam.class);
+        PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class);
+        return R.ok().add(userService.pageRel(pageParam));
+    }
+
+    @PreAuthorize("hasAuthority('system:user:list')")
     @PostMapping("/user/list")
     public R list(@RequestBody Map<String, Object> map) {
         return R.ok().add(userService.list());
@@ -113,4 +121,19 @@
         ExcelUtil.build(ExcelUtil.create(userService.list(), User.class), response);
     }
 
+    @PreAuthorize("hasAuthority('system:user:update')")
+    @OperationLog("閲嶇疆瀵嗙爜")
+    @PostMapping("/user/reset/pwd")
+    public R resetPwd(@RequestBody User user) {
+        if (!Cools.isEmpty(user.getPassword())) {
+            user.setPassword(userService.encodePassword(user.getPassword()));
+        }
+        user.setUpdateBy(getLoginUserId());
+        user.setUpdateTime(new Date());
+        if (!userService.updateById(user)) {
+            return R.error("閲嶇疆澶辫触");
+        }
+        return R.ok("閲嶇疆鎴愬姛");
+    }
+
 }

--
Gitblit v1.9.1