diff --git a/backend/src/main/java/com/designhub/service/DepartmentService.java b/backend/src/main/java/com/designhub/service/DepartmentService.java index df0c9cc..38638fb 100644 --- a/backend/src/main/java/com/designhub/service/DepartmentService.java +++ b/backend/src/main/java/com/designhub/service/DepartmentService.java @@ -499,7 +499,12 @@ public class DepartmentService { } private Map loadMemberCountMap() { - return userMapper.selectList(null).stream() + // 只统计启用且未删除的用户 + return userMapper.selectList( + new LambdaQueryWrapper() + .eq(User::getStatus, 1) + .eq(User::getDeleted, 0) + ).stream() .filter(user -> user.getDeptId() != null) .collect(Collectors.groupingBy( User::getDeptId, @@ -601,10 +606,12 @@ public class DepartmentService { return result; } - // 查找直接子部门 + // 查找直接子部门(只查询未删除且启用的部门) List children = departmentMapper.selectList( new LambdaQueryWrapper() .eq(Department::getParentId, deptId) + .eq(Department::getDeleted, 0) + .eq(Department::getStatus, 1) ); // 递归获取所有子部门 @@ -613,6 +620,7 @@ public class DepartmentService { result.addAll(getAllChildDeptIds(child.getId())); } + log.info("获取部门{}的所有子部门ID: {}", deptId, result); return result; } diff --git a/frontend/dist.tar.gz b/frontend/dist.tar.gz index bb30923..de5705c 100644 Binary files a/frontend/dist.tar.gz and b/frontend/dist.tar.gz differ