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));
     }