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 5a0146af..a9c85a26 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 @@ -243,12 +243,15 @@ public class AdminUserServiceImpl extends ServiceImpl 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) 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 getModules() { return lambdaQuery() - .select(WebComponent::getComponentName) + .select(WebComponent::getModuleName) .list() .stream() - .map(WebComponent::getComponentName) + .map(WebComponent::getModuleName) .collect(Collectors.toSet()); }