From fc9e7a20f1b34655adb4376d18ad36b5dd85b0c6 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 10 Jul 2023 17:57:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5=E6=8C=89=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1027662 --user=王孝刚 【接口测试】首页-运行中的定时任务-按版本筛选不显示对应版本定时任务
https://www.tapd.cn/55049933/s/1390948
---
 .../metersphere/base/mapper/ext/BaseScheduleMapper.xml   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseScheduleMapper.xml b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseScheduleMapper.xml
index ba7127daef..0b6546c532 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseScheduleMapper.xml
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseScheduleMapper.xml
@@ -127,16 +127,17 @@
         WHERE sch.`enable` = true
         AND sch.project_id = #{projectId,jdbcType=VARCHAR}
         <if test="versionId != null">
-            AND (
-            sch.group IN ('SWAGGER_IMPORT')
+            AND
+             (sch.group IN ('API_SCENARIO_TEST')
             and
             resource_id IN (SELECT id FROM api_scenario WHERE status != 'Trash' AND version_id = #{versionId})
             )
         </if>
         <if test="versionId == null">
-            AND sch.group IN ('API_SCENARIO_TEST','SWAGGER_IMPORT')
+            AND (sch.group IN ('SWAGGER_IMPORT')
+            or (sch.group IN ('API_SCENARIO_TEST')
             and
-            resource_id IN (SELECT id FROM api_scenario WHERE status != 'Trash' AND latest = 1)
+            resource_id IN (SELECT id FROM api_scenario WHERE status != 'Trash' AND latest = 1)))
         </if>
         ORDER BY sch.update_time DESC
     </select>