From 100ca67eec56323be48da4c3393555263bffb4ec Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Thu, 14 Aug 2025 18:18:42 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=A6=96=E6=AC=A1=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/auth/AdminAuthServiceImpl.java  |  2 +-
 .../system/service/user/AdminUserService.java      |  8 ++++++++
 .../system/service/user/AdminUserServiceImpl.java  | 14 +++++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/auth/AdminAuthServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/auth/AdminAuthServiceImpl.java
index 0ca08ff..32e6126 100644
--- a/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/auth/AdminAuthServiceImpl.java
+++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/auth/AdminAuthServiceImpl.java
@@ -314,6 +314,6 @@ public class AdminAuthServiceImpl implements AdminAuthService {
             throw exception(USER_NOT_EXISTS);
         }
 
-        userService.updateUserPassword(user.getId(), reqVO.getPassword());
+        userService.firstUpdateUserPassword(user.getId(), reqVO.getPassword());
     }
 }
diff --git a/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/user/AdminUserService.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/user/AdminUserService.java
index 5209d1c..3cb9117 100644
--- a/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/user/AdminUserService.java
+++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/user/AdminUserService.java
@@ -80,6 +80,14 @@ public interface AdminUserService {
      */
     void updateUserPassword(Long id, String password);
 
+    /**
+     * 首次修改密码
+     *
+     * @param id       用户编号
+     * @param password 密码
+     */
+    void firstUpdateUserPassword(Long id, String password);
+
     /**
      * 修改状态
      *
diff --git a/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/user/AdminUserServiceImpl.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/user/AdminUserServiceImpl.java
index b673d2d..3f53ee1 100644
--- a/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/user/AdminUserServiceImpl.java
+++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/service/user/AdminUserServiceImpl.java
@@ -217,7 +217,6 @@ public class AdminUserServiceImpl implements AdminUserService {
         AdminUserDO updateObj = new AdminUserDO();
         updateObj.setId(id);
         updateObj.setPassword(encodePassword(password)); // 加密密码
-        updateObj.setLoginDate(LocalDateTime.now());
         userMapper.updateById(updateObj);
 
         // 3. 记录操作日志上下文
@@ -225,6 +224,19 @@ public class AdminUserServiceImpl implements AdminUserService {
         LogRecordContext.putVariable("newPassword", updateObj.getPassword());
     }
 
+    @Override
+    public void firstUpdateUserPassword(Long id, String password) {
+        // 1. 校验用户存在
+        AdminUserDO user = validateUserExists(id);
+
+        // 2. 更新密码
+        AdminUserDO updateObj = new AdminUserDO();
+        updateObj.setId(id);
+        updateObj.setPassword(encodePassword(password)); // 加密密码
+        updateObj.setLoginDate(LocalDateTime.now());
+        userMapper.updateById(updateObj);
+    }
+
     @Override
     public void updateUserStatus(Long id, Integer status) {
         // 校验用户存在