From e42d5134188b4e93ebb0580ef60034976c987f0f Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 05 九月 2023 10:56:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 cc2573e..8bee62c 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,8 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.ruoyi.common.core.domain.param.ChangePwdParam;
+import com.ruoyi.utils.result.Results;
import io.swagger.annotations.*;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -237,4 +239,24 @@
public AjaxResult deptTree(SysDept dept) {
return success(deptService.selectDeptTreeList(dept));
}
+
+ /**
+ * 淇敼瀵嗙爜
+ */
+ @ApiOperation("淇敼瀵嗙爜")
+ @PreAuthorize("@ss.hasPermi('system:user:changePwd')")
+ @PutMapping("/changePwd")
+ public Results changePwd(@RequestBody ChangePwdParam changePwdParam) {
+ SysUser sysUser = userService.selectUserById(changePwdParam.getUserId());
+ userService.checkUserAllowed(sysUser);
+ userService.checkUserDataScope(changePwdParam.getUserId());
+ sysUser.setPassword(SecurityUtils.encryptPassword(changePwdParam.getNewPassword()));
+ sysUser.setUpdateBy(getUsername());
+ int num = userService.resetPwd(sysUser);
+ if(num == 0){
+ return Results.error("淇敼瀵嗙爜澶辫触锛�");
+ }else {
+ return Results.succeed("淇敼瀵嗙爜鎴愬姛锛�");
+ }
+ }
}
--
Gitblit v1.9.3