From 87583d3943b31224de1e055f942a6eb47508b3ee Mon Sep 17 00:00:00 2001
From: Jianguo-Genius <herman.song.yang@gmail.com>
Date: Fri, 13 Dec 2024 14:15:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/plan/mapper/ExtTestPlanApiCaseMapper.xml | 5 +++--
 .../plan/mapper/ExtTestPlanApiScenarioMapper.xml            | 5 +++--
 .../plan/mapper/ExtTestPlanFunctionalCaseMapper.xml         | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiCaseMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiCaseMapper.xml
index 5307617e03..c186935a3e 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiCaseMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiCaseMapper.xml
@@ -913,12 +913,13 @@
         END AS execResult,
         test_plan.group_id AS testPlanGroupId
         from test_plan_api_case resource
+        INNER JOIN api_test_case apiCase ON resource.api_case_id = apiCase.id
         INNER JOIN test_plan ON test_plan.id = resource.test_plan_id
-        where test_plan.id IN
+        where resource.test_plan_id IN
         <foreach collection="testPlanIds" item="testPlanId" separator="," open="(" close=")">
             #{testPlanId}
         </foreach>
-        AND test_plan.status != 'ARCHIVED'
+        AND apiCase.deleted IS FALSE
     </select>
 
     <select id="selectLastExecResultByTestPlanIds"
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiScenarioMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiScenarioMapper.xml
index f574d2da8e..b35f6d6ccf 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiScenarioMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanApiScenarioMapper.xml
@@ -639,12 +639,13 @@
         END AS execResult,
         test_plan.group_id AS testPlanGroupId
         from test_plan_api_scenario resource
+        INNER JOIN api_scenario scenario ON resource.api_scenario_id = scenario.id
         INNER JOIN test_plan ON test_plan.id = resource.test_plan_id
-        where test_plan.id IN
+        where resource.test_plan_id IN
         <foreach collection="testPlanIds" item="testPlanId" separator="," open="(" close=")">
             #{testPlanId}
         </foreach>
-        AND test_plan.status != 'ARCHIVED'
+        AND scenario.deleted IS FALSE
     </select>
 
     <select id="getBatchRunInfoByIds" resultType="io.metersphere.plan.dto.TestPlanApiScenarioBatchRunDTO">
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.xml
index 4993ace714..2f132f3ccd 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanFunctionalCaseMapper.xml
@@ -730,13 +730,13 @@
         END AS execResult,
         test_plan.group_id AS testPlanGroupId
         from test_plan_functional_case resource
+        INNER JOIN functional_case funcCase ON resource.functional_case_id = funcCase.id
         INNER JOIN test_plan ON test_plan.id = resource.test_plan_id
-        where test_plan.id IN
+        where resource.test_plan_id IN
         <foreach collection="testPlanIds" item="testPlanId" separator="," open="(" close=")">
             #{testPlanId}
         </foreach>
-        AND test_plan.status != 'ARCHIVED'
-
+        AND funcCase.deleted IS FALSE
     </select>
 
     <select id="selectIdsByProjectIdsOrCollectionIds" resultType="java.lang.String">