Merge branch 'main' of http://192.168.65.198:3000/toolchaintechnologycenter/spdm-backend

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;
 
 }

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;
 
 
     /**

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;
 
 }

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>

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"'>-->