From d803609b8a2e43afcf5921f42f29ce7f6e68fb84 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 08 十一月 2023 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 0e20c09..80e6733 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -6,6 +6,7 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.ruoyi.utils.result.Results;
import io.swagger.annotations.*;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +62,7 @@
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
+ @ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/list")
public TableDataInfo list(SysUser user) {
@@ -98,6 +100,7 @@
/**
* 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅
*/
+ @ApiOperation("鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('system:user:query')")
@GetMapping(value = {"/", "/{userId}"})
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) String userId) {
@@ -140,7 +143,7 @@
/**
* 淇敼鐢ㄦ埛
*/
-
+ @ApiOperation("淇敼鐢ㄦ埛")
@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
@@ -235,4 +238,25 @@
public AjaxResult deptTree(SysDept dept) {
return success(deptService.selectDeptTreeList(dept));
}
+
+ /**
+ * 淇敼瀵嗙爜
+ */
+ @ApiOperation("淇敼瀵嗙爜")
+// @PreAuthorize("@ss.hasPermi('system:user:changePwd')")
+ @PutMapping("/changePwd")
+ public Results changePwd(String newPassword) {
+ String userId = SecurityUtils.getUserId();
+ SysUser sysUser = userService.selectUserById(userId);
+ userService.checkUserAllowed(sysUser);
+ userService.checkUserDataScope(userId);
+ sysUser.setPassword(SecurityUtils.encryptPassword(newPassword));
+ sysUser.setUpdateBy(getUsername());
+ int num = userService.resetPwd(sysUser);
+ if(num == 0){
+ return Results.error("淇敼瀵嗙爜澶辫触锛�");
+ }else {
+ return Results.succeed("淇敼瀵嗙爜鎴愬姛锛�");
+ }
+ }
}
--
Gitblit v1.9.3