From d48f680c041b9cff07d5b17adc7761e7cc999113 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 8 Dec 2021 16:24:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89-CASE=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E7=AD=9B=E9=80=89=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【接口测试-接口定义-CASE模块下的接口用例，执行结果筛选功能失效，请确认并修改】https://www.tapd.cn/33805590/bugtrace/bugs/view?bug_id=1133805590001008658
---
 .../metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml  | 8 +++++++-
 .../common/components/search/search-components.js         | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

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 6dbe512d44..76a96db5c3 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
@@ -205,7 +205,7 @@
             </if>
         </if>
         <if test="${condition}.status != null">
-            and t2.status
+            and t1.status
             <include refid="condition">
                 <property name="object" value="${condition}.status"/>
             </include>
@@ -389,6 +389,12 @@
                                 #{value}
                             </foreach>
                         </when>
+                        <when test="key=='execResult' or key=='exec_result'">
+                            and t1.STATUS in
+                            <foreach collection="values" item="value" separator="," open="(" close=")">
+                                (#{value})
+                            </foreach>
+                        </when>
                     </choose>
                 </if>
                 <if test="request.toUpdate == null || request.toUpdate == false ">
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 6c3c1bc4da..7e5a345adb 100644
--- a/frontend/src/business/components/common/components/search/search-components.js
+++ b/frontend/src/business/components/common/components/search/search-components.js
@@ -165,7 +165,8 @@ export const API_CASE_RESULT = {
   },
   options: [
     {value: 'success', label: 'api_test.automation.success'},
-    {value: 'error', label: 'api_test.automation.fail'}
+    {value: 'error', label: 'api_test.automation.fail'},
+    {value: '', label: 'api_test.home_page.detail_card.unexecute'}
   ],
   props: { // 尾部控件的props，一般为element ui控件的props
     multiple: true