From 28813ab88bcabbf9393ccb0c23c850f398c25747 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Thu, 20 Oct 2022 11:37:17 +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=8Dcase=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E6=8F=90=E7=A4=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=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=1018469 --user=王孝刚 【接口测试】接口定义高级搜索-执行结果-不属于筛选提示异常
https://www.tapd.cn/55049933/s/1269122
---
 .../base/mapper/ext/ExtApiTestCaseMapper.xml  | 30 +++++++++++--------
 .../components/list/ApiCaseSimpleList.vue     |  7 +++--
 .../components/search/search-components.js    |  2 ++
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index 51af62ddfb..6ab760871d 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -114,13 +114,24 @@
                 <foreach collection="${object}.value" item="v" separator="," open="(" close=")">
                     #{v}
                 </foreach>
-
+                <if test="${object}.value.contains(''.toString()) or ${object}.value.contains('PENDING'.toString())">
+                    or t1.status is null or t1.status = ''
+                </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 and (${object}.value.contains(''.toString()) or ${object}.value.contains('PENDING'.toString()))">
+                    and t1.status is not null and t1.status != ''
+                </if>
+                <if test="${condition}.exec_result != null and !${object}.value.contains('PENDING'.toString())">
+                    or t1.status is null or t1.status = ''
+                </if>
                 <if test="${condition}.exec_result != null">
                     )
                 </if>
@@ -228,14 +239,10 @@
             </include>
         </if>
         <if test="${condition}.exec_result != null">
-            and (t3.status
+            and (t1.status
             <include refid="condition">
                 <property name="object" value="${condition}.exec_result"/>
             </include>
-            <if test="${condition}.exec_result.value.contains(''.toString()) or ${condition}.exec_result.value.contains('PENDING'.toString())">
-                or t3.status is null or t3.status = ''
-            </if>
-            )
         </if>
     </sql>
 
@@ -318,10 +325,10 @@
     <select id="list" resultType="io.metersphere.api.dto.definition.ApiTestCaseResult">
         SELECT
         t1.*,
-        t2.STATUS AS execResult,
+        t2.status AS execResult,
         t2.create_time AS execTime,
-        u2.NAME AS createUser,
-        u1.NAME AS updateUser,
+        u2.name AS createUser,
+        u1.name AS updateUser,
         a.method AS apiMethod
         FROM
         api_test_case t1
@@ -382,12 +389,11 @@
         a.path,
         a.protocol,
         t1.tags,
-        t1.status,
-        t3.status AS execResult,
+        t1.status AS execResult,
         t1.last_result_id AS lastResultId,
         project.NAME AS project_name,
         t1.delete_time,
-        deleteUser.NAME AS deleteUser,
+        deleteUser.name AS deleteUser,
         project_version.NAME AS version_name
         FROM
         api_test_case t1
diff --git a/api-test/frontend/src/business/definition/components/list/ApiCaseSimpleList.vue b/api-test/frontend/src/business/definition/components/list/ApiCaseSimpleList.vue
index 803709d7c5..ab7bd85e84 100644
--- a/api-test/frontend/src/business/definition/components/list/ApiCaseSimpleList.vue
+++ b/api-test/frontend/src/business/definition/components/list/ApiCaseSimpleList.vue
@@ -121,7 +121,8 @@
             :field="item"
             :fields-width="fieldsWidth"
             min-width="120px"
-            :label="$t('test_track.plan_view.execute_result')">
+            :label="$t('test_track.plan_view.execute_result')"
+            v-if="!trashEnable">
             <template v-slot:default="scope">
               <el-link @click="getExecResult(scope.row)"
                        :disabled="!scope.row.execResult || scope.row.execResult==='PENDING'">
@@ -320,7 +321,7 @@ import ThreadGroup from "@/business/definition/components/jmeter/components/thre
 import {parseEnvironment} from "@/business/environment/model/EnvironmentModel";
 import MsTableHeaderSelectPopover from "metersphere-frontend/src/components/table/MsTableHeaderSelectPopover";
 import MsTableAdvSearchBar from "metersphere-frontend/src/components/search/MsTableAdvSearchBar";
-import {API_CASE_CONFIGS} from "metersphere-frontend/src/components/search/search-components";
+import {API_CASE_CONFIGS, API_CASE_CONFIGS_TRASH} from "metersphere-frontend/src/components/search/search-components";
 import {
   _filter,
   _sort,
@@ -382,7 +383,7 @@ export default {
       fields: getCustomTableHeader('API_CASE', undefined),
       fieldsWidth: getCustomTableWidth('API_CASE'),
       condition: {
-        components: API_CASE_CONFIGS
+        components: this.trashEnable ? API_CASE_CONFIGS_TRASH : API_CASE_CONFIGS
       },
       selectCase: {},
       result: false,
diff --git a/framework/sdk-parent/frontend/src/components/search/search-components.js b/framework/sdk-parent/frontend/src/components/search/search-components.js
index 4b190568e4..b8ce6a63f6 100644
--- a/framework/sdk-parent/frontend/src/components/search/search-components.js
+++ b/framework/sdk-parent/frontend/src/components/search/search-components.js
@@ -821,6 +821,8 @@ export const API_DEFINITION_CONFIGS_TRASH = [ID, NAME, API_METHOD, API_PATH, API
 
 export const API_CASE_CONFIGS = [ID, NAME, PRIORITY, TAGS, API_CASE_RESULT, UPDATE_TIME, CREATE_TIME, CREATOR, FOLLOW_PEOPLE, API_PATH];
 
+export const API_CASE_CONFIGS_TRASH = [ID, NAME, PRIORITY, TAGS, UPDATE_TIME, CREATE_TIME, CREATOR, FOLLOW_PEOPLE, API_PATH];
+
 export const API_SCENARIO_CONFIGS = [ID, NAME, PRIORITY, TAGS, API_SCENARIO_RESULT, UPDATE_TIME, CREATE_TIME, CREATOR, FOLLOW_PEOPLE, STEP_COUNT, SCENARIO_MODULE_TREE, API_STATUS];
 export const API_SCENARIO_CONFIGS_TRASH = [ID, NAME, PRIORITY, TAGS, API_SCENARIO_RESULT, UPDATE_TIME, CREATE_TIME, CREATOR, FOLLOW_PEOPLE, STEP_COUNT, SCENARIO_MODULE_TREE, API_STATUS_TRASH];