From a16b8e6dfedd613b0312ff5fd5a15db3464a7855 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Thu, 13 Mar 2025 17:32:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gxwebsoft/common/system/controller/UserController.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
index bbb842f..f7fbf22 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java
@@ -197,6 +197,13 @@ public class UserController extends BaseController {
         user.setStatus(null);
         user.setUsername(null);
         user.setPassword(null);
+        if (user.getPassword() != null) {
+            String pwd = userService.encodePassword(user.getPassword());
+            User originData = userService.getByIdRel(user.getUserId());
+            if(!pwd.equals(originData.getPassword())) {
+                user.setPassword(pwd);
+            }
+        }
         if (userService.updateUser(user)) {
             return success("修改成功");
         }