From 72c6222eb58422cfa432862c0cba956b822001b6 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Mon, 28 Feb 2022 14:42:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=AF=86=E7=A0=81=EF=BC=8C=E4=BC=A0=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E4=B8=BA=E6=94=B9=E5=AF=86=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E4=BC=A0=E8=BF=99=E4=B8=BA123456?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xhpc/system/controller/SysUserController.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java
index 8b04d8d3..49926fc1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java
@@ -208,7 +208,11 @@ public class SysUserController extends BaseController {
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
-        user.setPassword(SecurityUtils.encryptPassword("123456"));
+        if(user.getPassword()==null || "".equals(user.getPassword())){
+            user.setPassword(SecurityUtils.encryptPassword("123456"));
+        }else{
+            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        }
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.resetPwd(user));
     }