From 46bf8a68ad1e3605387250d9565eb235ccdc8abb Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 05 九月 2023 11:41:36 +0800
Subject: [PATCH] pwd

---
 /dev/null                                                                        |    9 ---------
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java |   10 +++++-----
 2 files changed, 5 insertions(+), 14 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..7da0788 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;
@@ -246,11 +245,12 @@
     @ApiOperation("淇敼瀵嗙爜")
     @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){
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/param/ChangePwdParam.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/param/ChangePwdParam.java
deleted file mode 100644
index 48a4f8b..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/param/ChangePwdParam.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.ruoyi.common.core.domain.param;
-
-import lombok.Data;
-
-@Data
-public class ChangePwdParam {
-    private String userId;
-    private String newPassword;
-}

--
Gitblit v1.9.3