From 97e4f5c460d37ae3eb9c03396dd9dd6bb3f970cd Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期三, 22 十一月 2023 11:33:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 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 8bee62c..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,7 +6,6 @@ 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; @@ -244,13 +243,14 @@ * 淇敼瀵嗙爜 */ @ApiOperation("淇敼瀵嗙爜") - @PreAuthorize("@ss.hasPermi('system:user:changePwd')") +// @PreAuthorize("@ss.hasPermi('system:user:changePwd')") @PutMapping("/changePwd") - public Results changePwd(@RequestBody ChangePwdParam changePwdParam) { - SysUser sysUser = userService.selectUserById(changePwdParam.getUserId()); + public Results changePwd(String newPassword) { + String userId = SecurityUtils.getUserId(); + SysUser sysUser = userService.selectUserById(userId); userService.checkUserAllowed(sysUser); - userService.checkUserDataScope(changePwdParam.getUserId()); - sysUser.setPassword(SecurityUtils.encryptPassword(changePwdParam.getNewPassword())); + userService.checkUserDataScope(userId); + sysUser.setPassword(SecurityUtils.encryptPassword(newPassword)); sysUser.setUpdateBy(getUsername()); int num = userService.resetPwd(sysUser); if(num == 0){ -- Gitblit v1.9.3