wol/AgileBoot-Back-End
2
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
cuijiawang 2025-09-23 17:05:42 +08:00
parent f0633dfcea
commit c54a0db6ab
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/dept/service/impl/SysDeptServiceImpl.java
View File

@ -118,9 +118,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> 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);
}

2
agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/user/service/ISysUserService.java
View File

@ -40,7 +40,7 @@ public interface ISysUserService {
void deleteBatchRoleId(List<Long> userIds);
boolean checkDeptAssignedToUsers(Long deptId);
void checkDeptAssignedToUsers(Long deptId);
void checkAnyPostIsAssignedToUser(List<Long> ids);

10
agileboot-system/agileboot-system-base/src/main/java/com/agileboot/system/user/service/impl/SysUserServiceImpl.java
View File

@ -195,10 +195,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
@Override
public boolean checkDeptAssignedToUsers(Long deptId) {
public void checkDeptAssignedToUsers(Long deptId) {
LambdaQueryWrapper<SysUser> 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<SysUserMapper, SysUser> 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));
}