From 8608b458e42cd76fe4376d29f8e7a58570aa2a2e Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Mon, 26 Jan 2026 15:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=8A=A0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/zcloud/basic/info/command/UserAddExe.java | 2 +-
 .../java/com/zcloud/basic/info/command/UserUpdateExe.java   | 5 ++++-
 .../persistence/repository/impl/UserRepositoryImpl.java     | 6 +++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
index 136f861b..166f6413 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
@@ -120,7 +120,7 @@ public class UserAddExe {
             userE.setRoleId(roleId);
         }
         try {
-
+            userE.resetPassword();
             res = userGateway.add(userE);
             if (corpInfoDO != null && !ObjectUtils.isEmpty(corpInfoDO.getCorpName())) {
                 corpName = corpInfoDO.getCorpName();
diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
index 5249c8cc..3d93cf20 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
@@ -228,7 +228,10 @@ public class UserUpdateExe {
 
     @Transactional(rollbackFor = Exception.class)
     public boolean updatePasswordFromApp(AppUserUpdatePassWordCmd cmd) {
-
+        //新密码和旧密码不能相同
+        if (cmd.getPassword().equals(cmd.getNewPassword())) {
+            throw new BizException("新密码不能与旧密码相同");
+        }
         UserE userE = new UserE();
         userE.checkPassword(cmd.getNewPassword(), cmd.getConfirmPassword());
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
index 412aea99..71fd6607 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
@@ -527,7 +527,9 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
                 AccountPasswordCheckCmd accountPasswordCheckCmd = new AccountPasswordCheckCmd();
                 accountPasswordCheckCmd.setUserId(userDO.getId());
                 accountPasswordCheckCmd.setPassword(userDO.getPassword());
+                log.info("updateXgf,GBS验证用户密码请求:{}", JSONUtil.toJsonStr(accountPasswordCheckCmd));
                 SingleResponse<Long> response = accountFacade.checkPassword(accountPasswordCheckCmd);
+                log.info("updateXgf,GBS验证用户密码返回:{}", JSONUtil.toJsonStr(response));
                 if (!response.isSuccess()) {
                     return Response.buildFailure("原密码不正确");
                 }
@@ -535,11 +537,13 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
                 //验证本地密码
                 UserE userE = new UserE();
                 Boolean checkUserPassword = userE.checkUserEncryptionPassword(userDO.getPassword(), oldUserDO.getPassword());
+                log.info("updateXgf,验证用户本地密码结果:{}",checkUserPassword);
                 if(!checkUserPassword){
                     throw new BizException("密码错误");
                 }
             }
-
+        }else{
+            log.info("updateXgf,密码为空，不进行密码验证");
         }
 
         //修改多个密码