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)