From 4f9f8f1c86c0e0e5ff1854094547f6edc511a456 Mon Sep 17 00:00:00 2001
From: MeterSphere Bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Fri, 26 Aug 2022 13:41:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9E=E6=94=B6=E7=AB=99=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84=E7=BC=BA=E9=99=B7=20(#17469)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1016224 --user=王孝刚 【接口测试】接口定义，回收站，case列表，搜索执行结果是未执行的case，搜索结果是空的
https://www.tapd.cn/55049933/s/1234082

Co-authored-by: wxg0103 <727495428@qq.com>
---
 .../base/mapper/ext/ExtApiTestCaseMapper.xml     | 16 ++++++++++++++++
 .../components/search/search-components.js       |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index e5fcf5316f..306c57bd19 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -114,12 +114,21 @@
                 <foreach collection="${object}.value" item="v" separator="," open="(" close=")">
                     #{v}
                 </foreach>
+                <if test="${object}.value.contains(''.toString())">
+                    or t3.status is null
+                </if>
+                <if test="${condition}.exec_result != null">
+                    )
+                </if>
             </when>
             <when test='${object}.operator == "not in"'>
                 not in
                 <foreach collection="${object}.value" item="v" separator="," open="(" close=")">
                     #{v}
                 </foreach>
+                <if test="${condition}.exec_result != null">
+                    )
+                </if>
             </when>
             <when test='${object}.operator == "between"'>
                 between #{${object}.value[0]} and #{${object}.value[1]}
@@ -223,6 +232,13 @@
                 <property name="object" value="${condition}.status"/>
             </include>
         </if>
+        <if test="${condition}.exec_result != null">
+            and (t3.status
+            <include refid="condition">
+                <property name="object" value="${condition}.exec_result"/>
+            </include>
+        </if>
+
     </sql>
 
     <sql id="countCombine">
diff --git a/frontend/src/business/components/common/components/search/search-components.js b/frontend/src/business/components/common/components/search/search-components.js
index f832d9dae6..867bc670bb 100644
--- a/frontend/src/business/components/common/components/search/search-components.js
+++ b/frontend/src/business/components/common/components/search/search-components.js
@@ -211,7 +211,7 @@ export const API_STATUS_TRASH = {
 
 // 用例执行结果
 export const API_CASE_RESULT = {
-  key: "status",
+  key: "exec_result",
   name: 'MsTableSearchSelect',
   label: 'test_track.plan_view.execute_result',
   operator: {