diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/UserServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/UserServiceImpl.java index 02001a1..1a6fbea 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/UserServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/UserServiceImpl.java @@ -114,7 +114,7 @@ public class UserServiceImpl extends ServiceImpl implements Us @Override @Transactional(rollbackFor = Exception.class) public void create(User resources) { - resources.setDeptId(resources.getDept().getId()); +// resources.setDeptId(resources.getDept().getId()); if (userMapper.findByUsername(resources.getUsername()) != null) { throw new EntityExistException(User.class, "username", resources.getUsername()); } @@ -125,7 +125,7 @@ public class UserServiceImpl extends ServiceImpl implements Us throw new EntityExistException(User.class, "phone", resources.getPhone()); } save(resources); - if (UserTypeEnum.valueOf(String.valueOf(resources.getUserType())).equals(UserTypeEnum.EMPLOYEES)){ + if (Objects.equals(UserTypeEnum.getByValue(resources.getUserType()), UserTypeEnum.EMPLOYEES)) { EmEmployees emEmployees = new EmEmployees(); emEmployees.setDelFlag(0); emEmployees.setPhone(resources.getPhone()); @@ -133,7 +133,7 @@ public class UserServiceImpl extends ServiceImpl implements Us employeesService.save(emEmployees); } // 保存用户岗位 - userJobMapper.insertData(resources.getId(), resources.getJobs()); +// userJobMapper.insertData(resources.getId(), resources.getJobs()); // 保存用户角色 userRoleMapper.insertData(resources.getId(), resources.getRoles()); } @@ -143,14 +143,14 @@ public class UserServiceImpl extends ServiceImpl implements Us public void update(User resources) throws Exception { User user = getById(resources.getId()); User user1 = userMapper.findByUsername(resources.getUsername()); - User user2 = userMapper.findByEmail(resources.getEmail()); +// User user2 = userMapper.findByEmail(resources.getEmail()); User user3 = userMapper.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 (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()); } @@ -161,26 +161,26 @@ public class UserServiceImpl extends ServiceImpl implements Us redisUtils.del(CacheKey.ROLE_AUTH + resources.getId()); redisUtils.del(CacheKey.ROLE_USER + resources.getId()); } - // 修改部门会影响 数据权限 - if (!Objects.equals(resources.getDept(),user.getDept())) { - redisUtils.del(CacheKey.DATA_USER + resources.getId()); - } +// // 修改部门会影响 数据权限 +// if (!Objects.equals(resources.getDept(),user.getDept())) { +// redisUtils.del(CacheKey.DATA_USER + resources.getId()); +// } // 如果用户被禁用,则清除用户登录信息 if(!resources.getEnabled()){ onlineUserService.kickOutForUsername(resources.getUsername()); } - user.setDeptId(resources.getDept().getId()); +// user.setDeptId(resources.getDept().getId()); user.setUsername(resources.getUsername()); - user.setEmail(resources.getEmail()); +// user.setEmail(resources.getEmail()); user.setEnabled(resources.getEnabled()); user.setRoles(resources.getRoles()); - user.setDept(resources.getDept()); +// user.setDept(resources.getDept()); user.setJobs(resources.getJobs()); user.setPhone(resources.getPhone()); user.setNickName(resources.getNickName()); user.setGender(resources.getGender()); saveOrUpdate(user); - if (UserTypeEnum.valueOf(String.valueOf(resources.getUserType())).equals(UserTypeEnum.EMPLOYEES)){ + if (Objects.equals(UserTypeEnum.getByValue(resources.getUserType()), UserTypeEnum.EMPLOYEES)) { EmEmployees emEmployees = employeesService.findByUserId(resources.getId()); emEmployees.setPhone(resources.getPhone()); emEmployees.setName(resources.getNickName()); @@ -189,8 +189,8 @@ public class UserServiceImpl extends ServiceImpl implements Us // 清除缓存 delCaches(user.getId(), user.getUsername()); // 更新用户岗位 - userJobMapper.deleteByUserId(resources.getId()); - userJobMapper.insertData(resources.getId(), resources.getJobs()); +// userJobMapper.deleteByUserId(resources.getId()); +// userJobMapper.insertData(resources.getId(), resources.getJobs()); // 更新用户角色 userRoleMapper.deleteByUserId(resources.getId()); userRoleMapper.insertData(resources.getId(), resources.getRoles());