From 45ae58f39bacb58088d9882b9e28466f4bb7696e Mon Sep 17 00:00:00 2001
From: duandazhi <ab601026460@163.com>
Date: Wed, 28 Jul 2021 19:20:42 +0800
Subject: [PATCH] =?UTF-8?q?resetPwd=E3=80=81changeStatus=20=E5=8F=AA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E5=AE=9A=E7=9A=84=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E6=8A=8A=E5=85=B6=E4=BB=96=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java  | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index c92eb4b6..67798642 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -38,7 +38,7 @@ import com.ruoyi.system.service.ISysUserService;
 
 /**
  * 用户信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -122,7 +122,7 @@ public class SysUserController extends BaseController
 
     /**
      * 获取用户信息
-     * 
+     *
      * @return 用户信息
      */
     @GetMapping("getInfo")
@@ -234,9 +234,13 @@ public class SysUserController extends BaseController
     public AjaxResult resetPwd(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        user.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(userService.resetPwd(user));
+
+        //只修改特定的属性 dazer
+        SysUser newSyuser = new SysUser();
+        newSyuser.setUserId(user.getUserId());
+        newSyuser.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        newSyuser.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(userService.resetPwd(newSyuser));
     }
 
     /**
@@ -248,8 +252,13 @@ public class SysUserController extends BaseController
     public AjaxResult changeStatus(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
-        user.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(userService.updateUserStatus(user));
+
+        //只修改特定的属性 dazer
+        SysUser newSyuser = new SysUser();
+        newSyuser.setUserId(user.getUserId());
+        newSyuser.setStatus(user.getStatus());
+        newSyuser.setUpdateBy(SecurityUtils.getUsername());
+        return toAjax(userService.updateUserStatus(newSyuser));
     }
 
     /**