From c89e439ab587a0371589bce220def3e9817e7601 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 21 Jan 2021 18:39:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20JSON-SCHEMA=20=E6=95=B0=E6=8D=AE=E7=BC=BA=E9=99=B7=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  | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 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 62e675723d..2ac9acf970 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
@@ -145,37 +145,37 @@
     </sql>
     <sql id="combine">
         <if test='${condition}.name != null and (${name} == null or ${name} == "")'>
-            and atc.name
+            and t1.name
             <include refid="condition">
                 <property name="object" value="${condition}.name"/>
             </include>
         </if>
         <if test="${condition}.updateTime != null">
-            and atc.update_time
+            and t1.update_time
             <include refid="condition">
                 <property name="object" value="${condition}.updateTime"/>
             </include>
         </if>
          <if test="${condition}.createTime != null">
-            and atc.create_time
+            and t1.create_time
             <include refid="condition">
                 <property name="object" value="${condition}.createTime"/>
             </include>
         </if>
         <if test="${condition}.priority != null">
-            and atc.priority
+            and t1.priority
             <include refid="condition">
                 <property name="object" value="${condition}.priority"/>
             </include>
         </if>
         <if test="${condition}.creator != null">
-            and atc.user_id
+            and t1.user_id
             <include refid="condition">
                 <property name="object" value="${condition}.creator"/>
             </include>
         </if>
         <if test="${condition}.tags != null">
-            and atc.tags
+            and t1.tags
             <include refid="condition">
                 <property name="object" value="${condition}.tags"/>
             </include>
@@ -237,14 +237,14 @@
 
     <select id="listSimple" resultType="io.metersphere.api.dto.definition.ApiTestCaseDTO">
         select
-          atc.id, atc.project_id, atc.name, atc.api_definition_id, atc.priority, atc.description, atc.create_user_id, atc.update_user_id, atc.create_time, atc.update_time, atc.num,
-          a.module_id, a.path, a.protocol, atc.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
-          atc.api_definition_id = a.id
+          t1.api_definition_id = a.id
             <if test="request.protocol != null and request.protocol!=''">
                 and a.protocol = #{request.protocol}
             </if>
@@ -264,25 +264,25 @@
                 </include>
             </if>
             <if test="request.projectId != null and request.projectId!=''">
-                and atc.project_id = #{request.projectId}
+                and t1.project_id = #{request.projectId}
             </if>
             <if test="request.id != null and request.id!=''">
-                and atc.id = #{request.id}
+                and t1.id = #{request.id}
             </if>
             <if test="request.ids != null and request.ids.size() > 0">
                 <if test="request.projectId != null and request.projectId!=''">
                     and
                 </if>
-                atc.id in
+                t1.id in
                 <foreach collection="request.ids" item="caseId" separator="," open="(" close=")">
                     #{caseId}
                 </foreach>
             </if>
             <if test="request.name != null and request.name!=''">
-                and (atc.name like CONCAT('%', #{request.name},'%') or atc.tags like CONCAT('%', #{request.name},'%'))
+                and (t1.name like CONCAT('%', #{request.name},'%') or t1.tags like CONCAT('%', #{request.name},'%'))
             </if>
             <if test="request.createTime > 0">
-                and atc.create_time >= #{request.createTime}
+                and t1.create_time >= #{request.createTime}
             </if>
             <if test="request.moduleIds != null and request.moduleIds.size() > 0">
                 and a.module_id in
@@ -295,7 +295,7 @@
                     <if test="values != null and values.size() > 0">
                         <choose>
                             <when test="key == 'priority'">
-                                and atc.priority in
+                                and t1.priority in
                                 <foreach collection="values" item="value" separator="," open="(" close=")">
                                     #{value}
                                 </foreach>

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 2/2] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=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">