rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/ticket-add-solution

This commit is contained in:
曹鹏飞 2025-04-03 09:00:16 +08:00
parent ffce8c212b 92899d578f
commit e110af14fb
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java
View File

@ -243,12 +243,15 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
String email1=redisTemplate.opsForValue().get(Constant.REDIS_KEY_CHANGE_EMAIL_CODE + code); String email1=redisTemplate.opsForValue().get(Constant.REDIS_KEY_CHANGE_EMAIL_CODE + code);
VUtils.trueThrowBusinessError(StrUtil.isBlank(email1)) VUtils.trueThrowBusinessError(StrUtil.isBlank(email1))
.throwMessage("无效的激活码"); .throwMessage("无效的激活码");
AdminUser user = lambdaQuery().eq(AdminUser::getIsDel, 0).eq(AdminUser::getLoginName, email).one();
VUtils.trueThrowBusinessError(Objects.isNull(user))
.throwMessage("用户不存在:" + email);
lambdaUpdate() lambdaUpdate()
.set(AdminUser::getEmail, email1) .set(AdminUser::getEmail, email1)
.set(AdminUser::getLoginName, email1) .set(AdminUser::getLoginName, email1)
.set(AdminUser::getState, UserState.Activated.getState()) .set(AdminUser::getState, UserState.Activated.getState())
.set(AdminUser::getPassword, PASSWORDENCODER.encode(request.getPassword())) .set(AdminUser::getPassword, PASSWORDENCODER.encode(request.getPassword()))
.set(AdminUser::getUpdateBy, AdminUserUtil.getUserId()) .set(AdminUser::getUpdateBy, user.getId())
.set(AdminUser::getUpdateTime, LocalDateTime.now()) .set(AdminUser::getUpdateTime, LocalDateTime.now())
.eq(AdminUser::getIsDel, 0) .eq(AdminUser::getIsDel, 0)
.eq(AdminUser::getLoginName, email) .eq(AdminUser::getLoginName, email)

5
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
View File

@ -655,12 +655,15 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
String email1=redisTemplate.opsForValue().get(Constant.REDIS_KEY_CHANGE_EMAIL_CODE + code); String email1=redisTemplate.opsForValue().get(Constant.REDIS_KEY_CHANGE_EMAIL_CODE + code);
VUtils.trueThrowBusinessError(StrUtil.isBlank(email1)) VUtils.trueThrowBusinessError(StrUtil.isBlank(email1))
.throwMessage("无效的激活码"); .throwMessage("无效的激活码");
AppUser user = lambdaQuery().eq(AppUser::getIsDel, 0).eq(AppUser::getLoginName, email).one();
VUtils.trueThrowBusinessError(Objects.isNull(user))
.throwMessage("用户不存在:" + email);
lambdaUpdate() lambdaUpdate()
.set(AppUser::getEmail, email1) .set(AppUser::getEmail, email1)
.set(AppUser::getLoginName, email1) .set(AppUser::getLoginName, email1)
.set(AppUser::getState, UserState.Activated.getState()) .set(AppUser::getState, UserState.Activated.getState())
.set(AppUser::getPassword, PASSWORDENCODER.encode(request.getPassword())) .set(AppUser::getPassword, PASSWORDENCODER.encode(request.getPassword()))
.set(AppUser::getUpdateBy,AppUserUtil.getUserName()) .set(AppUser::getUpdateBy,user.getName())
.set(AppUser::getUpdateTime, LocalDateTime.now()) .set(AppUser::getUpdateTime, LocalDateTime.now())
.eq(AppUser::getIsDel, 0) .eq(AppUser::getIsDel, 0)
.eq(AppUser::getLoginName, email) .eq(AppUser::getLoginName, email)

4
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/WebComponentServiceImpl.java
View File

@ -57,10 +57,10 @@ public class WebComponentServiceImpl extends ServiceImpl<WebComponentMapper, Web
@Override @Override
public Collection<String> getModules() { public Collection<String> getModules() {
return lambdaQuery() return lambdaQuery()
.select(WebComponent::getComponentName) .select(WebComponent::getModuleName)
.list() .list()
.stream() .stream()
.map(WebComponent::getComponentName) .map(WebComponent::getModuleName)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
} }