From 5ae41005f0b914a7ddac1be2f480f1e8e53e26c1 Mon Sep 17 00:00:00 2001
From: lidongyang <506508008@qq.com>
Date: Tue, 3 Feb 2026 20:29:46 +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?=E3=80=81getTaskTree=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=AD=A6?=
 =?UTF-8?q?=E7=A7=91=E8=BF=87=E6=BB=A4=20bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sdm/project/model/req/ProjectTreeReq.java |  2 +-
 .../project/model/req/ProjectTreeTagReq.java  |  2 +-
 .../project/model/req/SpdmTaskListReq.java    |  2 +-
 .../mapper/SimulationProjectMapper.xml        | 10 ++++++++--
 .../resources/mapper/SimulationTaskMapper.xml | 19 ++++++++++++++-----
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/project/src/main/java/com/sdm/project/model/req/ProjectTreeReq.java b/project/src/main/java/com/sdm/project/model/req/ProjectTreeReq.java
index d03a776b..faa06313 100644
--- a/project/src/main/java/com/sdm/project/model/req/ProjectTreeReq.java
+++ b/project/src/main/java/com/sdm/project/model/req/ProjectTreeReq.java
@@ -31,6 +31,6 @@ public class ProjectTreeReq {
     @JsonProperty(value = "tag10")
     private String tag10;
 
-    private String filterDiscipline;
+    private List<String> filterDiscipline;
 
 }
diff --git a/project/src/main/java/com/sdm/project/model/req/ProjectTreeTagReq.java b/project/src/main/java/com/sdm/project/model/req/ProjectTreeTagReq.java
index fa0280d9..0befa7f9 100644
--- a/project/src/main/java/com/sdm/project/model/req/ProjectTreeTagReq.java
+++ b/project/src/main/java/com/sdm/project/model/req/ProjectTreeTagReq.java
@@ -17,7 +17,7 @@ public class ProjectTreeTagReq {
 
     private String projectNodeId;
 
-    private String filterDiscipline;
+    private List<String> filterDiscipline;
 
 
     /**
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 5f62a803..8c286a35 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
@@ -143,6 +143,6 @@ public class SpdmTaskListReq {
 
     private Long userId;
 
-    private String filterDiscipline;
+    private List<String> filterDiscipline;
 
 }
diff --git a/project/src/main/resources/mapper/SimulationProjectMapper.xml b/project/src/main/resources/mapper/SimulationProjectMapper.xml
index b4b7cc67..04a3d8d4 100644
--- a/project/src/main/resources/mapper/SimulationProjectMapper.xml
+++ b/project/src/main/resources/mapper/SimulationProjectMapper.xml
@@ -695,8 +695,14 @@
                 <bind name="searchKey10" value="'%' + req.tag10 + '%'"/>
                 and tag10 like #{searchKey10}
             </if>
-            <if test="req.filterDiscipline != null and req.filterDiscipline != ''">
-                and (discipline = #{req.filterDiscipline} or discipline = '' or discipline = null)
+
+            <if test="req.filterDiscipline != null and req.filterDiscipline.size > 0">
+                and discipline in (
+                <foreach collection='req.filterDiscipline' item='disciplineId' index='index' separator=','>
+                    #{disciplineId}
+                </foreach>
+                )
+                or discipline = '' or discipline = null
             </if>
         </where>
     </select>
diff --git a/project/src/main/resources/mapper/SimulationTaskMapper.xml b/project/src/main/resources/mapper/SimulationTaskMapper.xml
index 2b2fe2a3..2b5b57c9 100644
--- a/project/src/main/resources/mapper/SimulationTaskMapper.xml
+++ b/project/src/main/resources/mapper/SimulationTaskMapper.xml
@@ -572,8 +572,13 @@
             ]]>
         </if>
 
-        <if test="req.filterDiscipline != null and req.filterDiscipline != ''">
-            and (discipline = #{req.filterDiscipline} or discipline = '' or discipline = null)
+        <if test="req.filterDiscipline != null and req.filterDiscipline.size > 0">
+            and discipline in (
+            <foreach collection='req.filterDiscipline' item='disciplineId' index='index' separator=','>
+                #{disciplineId}
+            </foreach>
+            )
+            or discipline = '' or discipline = null
         </if>
 
 <!--        <if test='req.sortOrder != null and req.sortOrder == "0"'>-->
@@ -683,9 +688,13 @@
                 and STR_TO_DATE(finish_time,'%Y-%m-%d %H:%i:%s') <= #{req.finishETime}
             ]]>
         </if>
-
-        <if test="req.filterDiscipline != null and req.filterDiscipline != ''">
-            and (discipline = #{req.filterDiscipline} or discipline = '' or discipline = null)
+        <if test="req.filterDiscipline != null and req.filterDiscipline.size > 0">
+            and discipline in (
+            <foreach collection='req.filterDiscipline' item='disciplineId' index='index' separator=','>
+                #{disciplineId}
+            </foreach>
+            )
+            or discipline = '' or discipline = null
         </if>
 
 <!--        <if test='req.sortOrder != null and req.sortOrder == "0"'>-->