From 4634392438e3b84e71440a9924b068c5c7cbeac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 26 Mar 2025 11:33:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8F=96=E9=94=99=E5=AD=97=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/service/impl/WebComponentServiceImpl.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentServiceImpl.java
index 58b4e192..f9932cb4 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentServiceImpl.java
@@ -57,10 +57,10 @@ public class WebComponentServiceImpl extends ServiceImpl<WebComponentMapper, Web
     @Override
     public Collection<String> getModules() {
         return lambdaQuery()
-                .select(WebComponent::getComponentName)
+                .select(WebComponent::getModuleName)
                 .list()
                 .stream()
-                .map(WebComponent::getComponentName)
+                .map(WebComponent::getModuleName)
                 .collect(Collectors.toSet());
     }
 

From 92899d578f81e0e404a5269743d504f7053b614e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 26 Mar 2025 16:58:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=BF=80=E6=B4=BB=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/service/impl/AdminUserServiceImpl.java        | 5 ++++-
 .../repository/service/impl/AppUserServiceImpl.java          | 5 ++++-
 2 files changed, 8 insertions(+), 2 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 a5a0bae2..c27acbbd 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
@@ -242,12 +242,15 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             String email1=redisTemplate.opsForValue().get(Constant.REDIS_KEY_CHANGE_EMAIL_CODE + code);
             VUtils.trueThrowBusinessError(StrUtil.isBlank(email1))
                     .throwMessage("无效的激活码");
+            AdminUser user = lambdaQuery().eq(AdminUser::getIsDel, 0).eq(AdminUser::getLoginName, email).one();
+            VUtils.trueThrowBusinessError(Objects.isNull(user))
+                    .throwMessage("用户不存在:" + email);
             lambdaUpdate()
                     .set(AdminUser::getEmail, email1)
                     .set(AdminUser::getLoginName, email1)
                     .set(AdminUser::getState, UserState.Activated.getState())
                     .set(AdminUser::getPassword, PASSWORDENCODER.encode(request.getPassword()))
-                    .set(AdminUser::getUpdateBy, AdminUserUtil.getUserId())
+                    .set(AdminUser::getUpdateBy, user.getId())
                     .set(AdminUser::getUpdateTime, LocalDateTime.now())
                     .eq(AdminUser::getIsDel, 0)
                     .eq(AdminUser::getLoginName, email)
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 4f6f7d94..b2a2e4a2 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
@@ -655,12 +655,15 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
             String email1=redisTemplate.opsForValue().get(Constant.REDIS_KEY_CHANGE_EMAIL_CODE + code);
             VUtils.trueThrowBusinessError(StrUtil.isBlank(email1))
                     .throwMessage("无效的激活码");
+            AppUser user = lambdaQuery().eq(AppUser::getIsDel, 0).eq(AppUser::getLoginName, email).one();
+            VUtils.trueThrowBusinessError(Objects.isNull(user))
+                    .throwMessage("用户不存在:" + email);
             lambdaUpdate()
                     .set(AppUser::getEmail, email1)
                     .set(AppUser::getLoginName, email1)
                     .set(AppUser::getState, UserState.Activated.getState())
                     .set(AppUser::getPassword, PASSWORDENCODER.encode(request.getPassword()))
-                    .set(AppUser::getUpdateBy,AppUserUtil.getUserName())
+                    .set(AppUser::getUpdateBy,user.getName())
                     .set(AppUser::getUpdateTime, LocalDateTime.now())
                     .eq(AppUser::getIsDel, 0)
                     .eq(AppUser::getLoginName, email)