|
|
@ -365,7 +365,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());
|
|
|
|
redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 如果用户被禁用,则清除用户登录信息
|
|
|
|
// 如果用户被禁用,则清除用户登录信息
|
|
|
|
if (!resources.getEnabled()) {
|
|
|
|
if (Boolean.FALSE.equals(resources.getEnabled())) {
|
|
|
|
onlineUserService.kickOutForUsername(resources.getUsername());
|
|
|
|
onlineUserService.kickOutForUsername(resources.getUsername());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -375,6 +375,11 @@ public class UserServiceImpl implements UserService {
|
|
|
|
.getCompanyName().trim().concat(StrPool.COLON).concat(resources.getUsername());
|
|
|
|
.getCompanyName().trim().concat(StrPool.COLON).concat(resources.getUsername());
|
|
|
|
user.setUsername(username);
|
|
|
|
user.setUsername(username);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (ObjectUtil.isNotNull(resources.getTemplateId())) {
|
|
|
|
|
|
|
|
companyService.updateCompanyTemplateId(resources.getTemplateId(), user.getCompanyId());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
user.setIsReview(resources.getIsReview());
|
|
|
|
user.setIsReview(resources.getIsReview());
|
|
|
|
user.setEmail(resources.getEmail());
|
|
|
|
user.setEmail(resources.getEmail());
|
|
|
|
user.setEnabled(resources.getEnabled());
|
|
|
|
user.setEnabled(resources.getEnabled());
|
|
|
@ -401,6 +406,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
user.setPhone(resources.getPhone());
|
|
|
|
user.setPhone(resources.getPhone());
|
|
|
|
user.setGender(resources.getGender());
|
|
|
|
user.setGender(resources.getGender());
|
|
|
|
userRepository.save(user);
|
|
|
|
userRepository.save(user);
|
|
|
|
|
|
|
|
|
|
|
|
// 清理缓存
|
|
|
|
// 清理缓存
|
|
|
|
delCaches(user.getId(), user.getUsername());
|
|
|
|
delCaches(user.getId(), user.getUsername());
|
|
|
|
}
|
|
|
|
}
|
|
|
|