From 012c8ec8417b057a0e92b44fe1586b143716ead7 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Sat, 20 Feb 2021 13:59:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BC=9A=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

解决点击文档会报错的问题
---
 .../base/mapper/ext/ExtApiDocumentMapper.xml           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDocumentMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDocumentMapper.xml
index d0e9515f31..655c980f30 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDocumentMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDocumentMapper.xml
@@ -5,13 +5,13 @@
         SELECT api.id,api.name FROM Api_definition api
         <where>
             <if test="request.projectId != null">
-                api.project_Id = #{request.projectId}
+                AND api.project_Id = #{request.projectId}
             </if>
-            <if test="request.name != null">
-                api.project_Id like CONCAT('%', #{request.name},'%')
+            <if test="request.name != null and request.name != '' ">
+                AND api.name like CONCAT('%', #{request.name},'%')
             </if>
-            <if test="request.type != null">
-                api.method = #{request.type}
+            <if test="request.type != null and request.type != '' and request.type != 'ALL' ">
+                AND  api.method = #{request.type}
             </if>
 
             <if test="request.moduleIds != null and request.moduleIds.size() > 0">

From 8fd91be7b10eb2ab6be1e7854da2d94da0cd03dc Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Sat, 20 Feb 2021 14:06:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E5=8F=98?=
 =?UTF-8?q?=E5=8A=A8=E6=97=B6=E4=BA=A7=E7=94=9F=E7=9A=84=E9=94=99=E5=BA=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

解决文档右侧列表排序变动时产生的错序问题
---
 .../api/definition/components/document/ApiDocumentItem.vue       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/business/components/api/definition/components/document/ApiDocumentItem.vue b/frontend/src/business/components/api/definition/components/document/ApiDocumentItem.vue
index 6b2c0e1925..4a4488eb60 100644
--- a/frontend/src/business/components/api/definition/components/document/ApiDocumentItem.vue
+++ b/frontend/src/business/components/api/definition/components/document/ApiDocumentItem.vue
@@ -384,6 +384,7 @@ export default {
       }
 
       let simpleInfoUrl = "/api/document/selectApiSimpleInfo";
+      this.apiSimpleInfoArray = [];
       this.$post(simpleInfoUrl, simpleRequest, response => {
         this.apiSimpleInfoArray = response.data;
         this.apiStepIndex = 0;