From cf9b64f16d52fbec7c71cfa5ec92dbad1d42a6d3 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 21 Jan 2021 19:01:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtApiTestCaseMapper.xml  | 60 +++++++++----------
 1 file changed, 29 insertions(+), 31 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 2ac9acf970..b5c9256f6a 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
@@ -156,7 +156,7 @@
                 <property name="object" value="${condition}.updateTime"/>
             </include>
         </if>
-         <if test="${condition}.createTime != null">
+        <if test="${condition}.createTime != null">
             and t1.create_time
             <include refid="condition">
                 <property name="object" value="${condition}.createTime"/>
@@ -181,7 +181,7 @@
             </include>
         </if>
         <if test="${condition}.status != null">
-            and ader.status
+            and t2.status
             <include refid="condition">
                 <property name="object" value="${condition}.status"/>
             </include>
@@ -190,17 +190,17 @@
     </sql>
     <select id="list" resultType="io.metersphere.api.dto.definition.ApiTestCaseResult">
         SELECT
-            t1.*,
-            t2.STATUS AS execResult,
-            t2.create_time AS execTime,
-            u2.NAME AS createUser,
-            u1.NAME AS updateUser
+        t1.*,
+        t2.STATUS AS execResult,
+        t2.create_time AS execTime,
+        u2.NAME AS createUser,
+        u1.NAME AS updateUser
         FROM
-            api_test_case t1
-            LEFT JOIN api_definition_exec_result t2 ON t1.last_result_id = t2.id
-            LEFT JOIN USER u1 ON t1.update_user_id = u1.id
-            LEFT JOIN USER u2 ON t1.create_user_id = u2.id
-            LEFT JOIN USER u3 ON t2.user_id = u3.id
+        api_test_case t1
+        LEFT JOIN api_definition_exec_result t2 ON t1.last_result_id = t2.id
+        LEFT JOIN USER u1 ON t1.update_user_id = u1.id
+        LEFT JOIN USER u2 ON t1.create_user_id = u2.id
+        LEFT JOIN USER u3 ON t2.user_id = u3.id
         <where>
             <if test="request.combine != null">
                 <include refid="combine">
@@ -230,32 +230,30 @@
             order by
             <foreach collection="request.orders" separator="," item="order">
                 t1.${order.name} ${order.type}
-             </foreach>
+            </foreach>
         </if>
 
     </select>
 
     <select id="listSimple" resultType="io.metersphere.api.dto.definition.ApiTestCaseDTO">
         select
-          t1.id, t1.project_id, t1.name, t1.api_definition_id, t1.priority, t1.description, t1.create_user_id, t1.update_user_id, t1.create_time, t1.update_time, t1.num,
-          a.module_id, a.path, a.protocol, t1.tags
+        t1.id, t1.project_id, t1.name, t1.api_definition_id, t1.priority, t1.description, t1.create_user_id, t1.update_user_id, t1.create_time, t1.update_time, t1.num,
+        a.module_id, a.path, a.protocol, t1.tags
         from
-          api_test_case atc
-        inner join
-          api_definition a
-        on
-          t1.api_definition_id = a.id
-            <if test="request.protocol != null and request.protocol!=''">
-                and a.protocol = #{request.protocol}
-            </if>
-            <choose>
-                <when test="request.status == 'Trash'">
-                    and a.status = 'Trash'
-                </when>
-                <otherwise>
-                    and a.status != 'Trash'
-                </otherwise>
-            </choose>
+        api_test_case t1
+        LEFT JOIN api_definition_exec_result t2 ON t1.last_result_id = t2.id
+        inner join api_definition a on  t1.api_definition_id = a.id
+        <if test="request.protocol != null and request.protocol!=''">
+            and a.protocol = #{request.protocol}
+        </if>
+        <choose>
+            <when test="request.status == 'Trash'">
+                and a.status = 'Trash'
+            </when>
+            <otherwise>
+                and a.status != 'Trash'
+            </otherwise>
+        </choose>
         <where>
             <if test="request.combine != null">
                 <include refid="combine">