From 0fb0c19acfdfbeb6c63f59641d79f3ac1239cc49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Tue, 11 Mar 2025 14:18:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E4=B9=9F=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/service/impl/AdminUserServiceImpl.java      | 7 +++++--
 .../repository/service/impl/AppUserServiceImpl.java        | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java
index 5ec21c5d..a5a0bae2 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java
@@ -244,9 +244,12 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
                     .throwMessage("无效的激活码");
             lambdaUpdate()
                     .set(AdminUser::getEmail, email1)
+                    .set(AdminUser::getLoginName, email1)
                     .set(AdminUser::getState, UserState.Activated.getState())
-                    .set(AdminUser::getPassword,PASSWORDENCODER.encode(request.getPassword()))
-                    .set(AdminUser::getUpdateTime,LocalDateTime.now())
+                    .set(AdminUser::getPassword, PASSWORDENCODER.encode(request.getPassword()))
+                    .set(AdminUser::getUpdateBy, AdminUserUtil.getUserId())
+                    .set(AdminUser::getUpdateTime, LocalDateTime.now())
+                    .eq(AdminUser::getIsDel, 0)
                     .eq(AdminUser::getLoginName, email)
                     .update();
         }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
index 2d672e02..c6a53ae4 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
@@ -657,9 +657,12 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
                     .throwMessage("无效的激活码");
             lambdaUpdate()
                     .set(AppUser::getEmail, email1)
+                    .set(AppUser::getLoginName, email1)
                     .set(AppUser::getState, UserState.Activated.getState())
-                    .set(AppUser::getPassword,PASSWORDENCODER.encode(request.getPassword()))
-                    .set(AppUser::getUpdateTime,LocalDateTime.now())
+                    .set(AppUser::getPassword, PASSWORDENCODER.encode(request.getPassword()))
+                    .set(AppUser::getUpdateBy,AppUserUtil.getUserName())
+                    .set(AppUser::getUpdateTime, LocalDateTime.now())
+                    .eq(AppUser::getIsDel, 0)
                     .eq(AppUser::getLoginName, email)
                     .update();
         }