root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
lyd
2022-11-17 17:33:00 +08:00
parent 8a55b97e05
commit ffb6165616
2 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java
View File

@@ -101,15 +101,15 @@ public class UserServiceImpl implements UserService {
User user = userRepository.findById(resources.getId()).orElseGet(User::new);
ValidationUtil.isNull(user.getId(), "User", "id", resources.getId());
User user1 = userRepository.findByUsername(resources.getUsername());
User user2 = userRepository.findByEmail(resources.getEmail());
// User user2 = userRepository.findByEmail(resources.getEmail());
if (user1 != null && !user.getId().equals(user1.getId())) {
throw new EntityExistException(User.class, "username", resources.getUsername());
}
if (user2 != null && !user.getId().equals(user2.getId())) {
throw new EntityExistException(User.class, "email", resources.getEmail());
}
// if (user2 != null && !user.getId().equals(user2.getId())) {
// throw new EntityExistException(User.class, "email", resources.getEmail());
// }
// 如果用户的角色改变
if (!resources.getRoles().equals(user.getRoles())) {
redisUtils.del(CacheKey.DATA_USER + resources.getId());