diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index 904a7d99..0eb364a4 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -1515,6 +1515,13 @@ public class TaskServiceImpl implements ITaskService { // 2. 基础任务列表查询 req.setUserId(userId); + + // 二次查询过滤学科 + if (StringUtils.isNotBlank(req.getDiscipline())) { + req.setFilterDiscipline(new ArrayList<>()); + req.setDisciplineList(Arrays.stream(req.getDiscipline().split(",")).toList()); + } + List allTaskList = mapper.optimisedGtTaskList(tenantId, req); req.setTodayTmrTasks(ProjectConstants.TODAY_TMR_TASKS); List todayTmrTaskList = mapper.optimisedGtTaskList(tenantId, req);