| | |
|---|
| | | tTaskLambdaQueryWrapper.eq(TTask::getProjectId, projectDept.getId()); |
|---|
| | | userDeptIds.add(projectDept.getId()); |
|---|
| | | } else { |
|---|
| | | TProjectDept parent = projectDeptService.getById(projectDept.getParentId()); |
|---|
| | | List<TProjectDept> list = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, parent.getId()).list(); |
|---|
| | | List<TProjectDept> list = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, projectDept.getId()).list(); |
|---|
| | | List<String> deptIds = list.stream().map(TProjectDept::getId).collect(Collectors.toList()); |
|---|
| | | if (!deptIds.isEmpty()) { |
|---|
| | | tTaskLambdaQueryWrapper.in(TTask::getProjectId, deptIds); |
|---|
| | |
|---|
| | | } |
|---|
| | | pendingTask.add(taskTodayVO); |
|---|
| | | } |
|---|
| | | // 将pendingTask按照距离 从小到大排序 |
|---|
| | | pendingTask.sort(Comparator.comparing(TaskPendingVO::getDistance)); |
|---|
| | | res.setPendingTask(pendingTask); |
|---|
| | | res.setLeaveList(leaveList); |
|---|
| | | List<TaskTodayVO> todayTask = new ArrayList<>(); |
|---|
