From 19f76a1cb77489b6ec844b785642c292f55c48b0 Mon Sep 17 00:00:00 2001
From: lidongyang <506508008@qq.com>
Date: Mon, 30 Mar 2026 16:02:29 +0800
Subject: [PATCH] =?UTF-8?q?fix[project]:=20=E4=BF=AE=E6=94=B9=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E8=AE=A1=E6=95=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sdm/project/service/impl/TaskServiceImpl.java | 7 +++++++
 1 file changed, 7 insertions(+)

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<SpdmTaskVo> allTaskList = mapper.optimisedGtTaskList(tenantId, req);
         req.setTodayTmrTasks(ProjectConstants.TODAY_TMR_TASKS);
         List<SpdmTaskVo> todayTmrTaskList = mapper.optimisedGtTaskList(tenantId, req);