From 0591f2ae467177bfc6edeb83ee6f66e597137479 Mon Sep 17 00:00:00 2001
From: OpenCode <opencode@vben.dev>
Date: Thu, 16 Jul 2026 20:31:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD-=E9=AA=8C=E8=AF=81=E6=97=A7=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E4=BD=BF=E7=94=A8newPassword=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=AE=BE=E7=BD=AE=E6=96=B0=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/service/sys/impl/BaseSysUserServiceImpl.java      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java b/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java
index 23acd25..7ddd0b4 100644
--- a/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java
+++ b/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java
@@ -125,9 +125,10 @@ public class BaseSysUserServiceImpl extends BaseServiceImpl<BaseSysUserMapper, B
         CoolPreconditions.checkEmpty(userEntity, "用户不存在");
         userEntity.setNickName(body.getStr("nickName"));
         userEntity.setHeadImg(body.getStr("headImg"));
-        // 修改密码
-        if (StrUtil.isNotEmpty(body.getStr("password"))) {
-            userEntity.setPassword(MD5.create().digestHex(body.getStr("password")));
+        if (StrUtil.isNotEmpty(body.getStr("password")) && StrUtil.isNotEmpty(body.getStr("newPassword"))) {
+            String oldPasswordMd5 = MD5.create().digestHex(body.getStr("password"));
+            CoolPreconditions.check(!oldPasswordMd5.equals(userEntity.getPassword()), "原密码错误");
+            userEntity.setPassword(MD5.create().digestHex(body.getStr("newPassword")));
             userEntity.setPasswordV(userEntity.getPasswordV() + 1);
             coolCache.set("admin:passwordVersion:" + userId, userEntity.getPasswordV());
         }