针对正北按照部门导出:根据时间过滤掉该时间段离职或未入职的员工

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -414,6 +414,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
             // 获取所有用户并按部门分组
             List<User> allUsers = userMapper.selectList(new QueryWrapper<User>().eq("company_id", targetUser.getCompanyId()));
+
+            //根据时间过滤掉该时间段离职或未入职的员工
+            if (allUsers != null && !allUsers.isEmpty()) {
+                allUsers.removeIf(u -> u.getIsActive() == 0 &&u.getInactiveDate()!=null && u.getInactiveDate().isBefore(startDate));
+                allUsers.removeIf(u -> u.getIsActive() == 1 &&u.getInductionDate()!=null && u.getInductionDate().isAfter(lastDate));
+            }
             Map<Integer, List<User>> usersByDepartment = allUsers.stream().collect(Collectors.groupingBy(User::getDepartmentId));
 
             // 获取部门信息