1.修复人员列表修改功能数据丢失

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -192,37 +192,8 @@ public class UserServiceImpl implements UserService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateSync(User resources) throws Exception {
-        //设置用户信息
-        resources = setDmUserInfoToSysUser(resources);
-        if(resources.getDept() != null && resources.getDept().getId() == null){
-            resources.setDept(null);
-        }
-        if(resources.getDmUser() != null && resources.getDmUser().getId() == null){
-            resources.setDmUser(null);
-        }
-        if(resources.getDmCompany() != null && resources.getDmCompany().getCompanyId() == null){
-            resources.setDmCompany(null);
-        }
         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 user3 = userRepository.findByPhone(resources.getPhone());
-        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 (user3 != null && !user.getId().equals(user3.getId())) {
-            throw new EntityExistException(User.class, "phone", resources.getPhone());
-        }
-        // 如果用户的角色改变
-        if (!resources.getRoles().equals(user.getRoles())) {
-            redisUtils.del(CacheKey.DATA_USER + resources.getId());
-            redisUtils.del(CacheKey.MENU_USER + resources.getId());
-            redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());
-        }
         // 如果用户被禁用，则清除用户登录信息
         if(!resources.getEnabled()){
             onlineUserService.kickOutForUsername(resources.getUsername());