From 6b63f338fa2e45ddb99a4a215cdf09e98e08329d Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 8 Jul 2022 18:27:36 +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=87=8D=E8=B7=91=E7=BB=93=E6=9E=9C=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/exec/api/ApiCaseExecuteService.java          |  2 +-
 .../mapper/ext/ExtApiDefinitionExecResultMapper.xml  | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseExecuteService.java b/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseExecuteService.java
index b67bfe31b0..a5c763b05a 100644
--- a/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseExecuteService.java
+++ b/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseExecuteService.java
@@ -268,7 +268,7 @@ public class ApiCaseExecuteService {
         if (StringUtils.isEmpty(request.getTriggerMode())) {
             request.setTriggerMode(ApiRunMode.DEFINITION.name());
         }
-
+        // 重试数据直接获取执行的报告
         Map<String, ApiDefinitionExecResultWithBLOBs> executeQueue = request.isRerun() ? request.getExecuteQueue() : new LinkedHashMap<>();
 
         String status = request.getConfig().getMode().equals(RunModeConstants.SERIAL.toString()) ? APITestStatus.Waiting.name() : APITestStatus.Running.name();
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
index 8393fb39f9..343a81e4c5 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
@@ -432,12 +432,16 @@
 
     <select id="selectRerunResult" resultType="io.metersphere.base.domain.ApiDefinitionExecResultWithBLOBs">
         SELECT
-            *
+            r.*
         FROM
-            api_definition_exec_result
+            api_definition_exec_result r
+            INNER JOIN api_test_case c ON r.resource_id = c.id
+            AND c.`status` != 'Trash'
         WHERE
-            status != 'success'
-            AND integrated_report_id = #{reportId} order by create_time asc
+            r.STATUS != 'success'
+            AND r.integrated_report_id = #{reportId}
+        ORDER BY
+            r.create_time ASC
     </select>
 
 </mapper>