From 32bf63419be5b62f10c5b7e8ca7f0df6cf722409 Mon Sep 17 00:00:00 2001
From: lidongyang <506508008@qq.com>
Date: Wed, 18 Mar 2026 09:33:31 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=A6=E7=A7=91=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/sdm/project/model/req/SpdmTaskListReq.java  | 3 +++
 .../java/com/sdm/project/service/impl/TaskServiceImpl.java    | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java
index 026020fa..b56b93a6 100644
--- a/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java
+++ b/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java
@@ -152,6 +152,9 @@ public class SpdmTaskListReq {
 
     private List<String> filterDiscipline;
 
+    // 二次查询过滤学科
+    private String discipline;
+
     private String taskId;
 
     /**
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 168df881..f5850525 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
@@ -1177,6 +1177,10 @@ public class TaskServiceImpl implements ITaskService {
         }
         StopWatch stopWatch = new StopWatch("所有任务方法计时");
         stopWatch.start("查所有任务");
+        // 二次查询过滤学科
+        if (StringUtils.isNotBlank(req.getDiscipline())) {
+            req.setFilterDiscipline(Collections.singletonList(req.getDiscipline()));
+        }
         List<SpdmTaskVo> allTaskList = mapper.optimisedGtTaskList(tenantId, req);
         stopWatch.stop();
         JSONObject jsonObject = buildEmptyJsonResp(req);