diff --git a/agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/dept/service/impl/SysDeptServiceImpl.java b/agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/dept/service/impl/SysDeptServiceImpl.java index c3f9722..e80a738 100644 --- a/agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/dept/service/impl/SysDeptServiceImpl.java +++ b/agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/dept/service/impl/SysDeptServiceImpl.java @@ -118,9 +118,8 @@ public class SysDeptServiceImpl extends ServiceImpl impl if (this.hasChildrenDept(entity.getDeptId(), null)) { throw new BizException(ErrorCode.Business.DEPT_EXIST_CHILD_DEPT_NOT_ALLOW_DELETE); } - if (userService.checkDeptAssignedToUsers(entity.getDeptId())) { - throw new BizException(ErrorCode.Business.DEPT_EXIST_LINK_USER_NOT_ALLOW_DELETE); - } + userService.checkDeptAssignedToUsers(entity.getDeptId()); + super.removeById(deptId); } diff --git a/agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/user/service/ISysUserService.java b/agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/user/service/ISysUserService.java index f2ca241..04288db 100644 --- a/agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/user/service/ISysUserService.java +++ b/agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/user/service/ISysUserService.java @@ -40,7 +40,7 @@ public interface ISysUserService { void deleteBatchRoleId(List userIds); - boolean checkDeptAssignedToUsers(Long deptId); + void checkDeptAssignedToUsers(Long deptId); void checkAnyPostIsAssignedToUser(List ids); diff --git a/agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/user/service/impl/SysUserServiceImpl.java b/agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/user/service/impl/SysUserServiceImpl.java index 35d4ca9..e33faae 100644 --- a/agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/user/service/impl/SysUserServiceImpl.java +++ b/agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/user/service/impl/SysUserServiceImpl.java @@ -195,10 +195,12 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public boolean checkDeptAssignedToUsers(Long deptId) { + public void checkDeptAssignedToUsers(Long deptId) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(SysUser.class) .eq(SysUser::getDeptId, deptId); - return super.exists(queryWrapper); + if (super.exists(queryWrapper)) { + throw new BizException(ErrorCode.Business.DEPT_EXIST_LINK_USER_NOT_ALLOW_DELETE); + } } /** @@ -219,8 +221,8 @@ public class SysUserServiceImpl extends ServiceImpl impl return Map.of(); } return super.list(Wrappers.lambdaQuery(SysUser.class) - .select(SysUser::getUserId, SysUser::getUsername) - .in(SysUser::getUserId, userIds)) + .select(SysUser::getUserId, SysUser::getUsername) + .in(SysUser::getUserId, userIds)) .stream() .collect(Collectors.toMap(SysUser::getUserId, SysUser::getUsername)); }