From ed30ed28989aedbea6ca9245cdddc4ea1dce7dad Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 7 Jun 2021 16:33:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E7=94=A8=E4=BE=8B=E7=9A=84=E5=85=A8=E9=80=89?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复场景引用用例的全选不生效的缺陷
---
 .../metersphere/api/service/ApiTestCaseService.java  |  1 +
 .../base/mapper/ext/ExtApiTestCaseMapper.xml         | 12 ++++++------
 .../automation/scenario/api/RelevanceCaseList.vue    |  9 ++++++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
index e12d719822..1b819e7a2f 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@@ -694,6 +694,7 @@ public class ApiTestCaseService {
     public List<ApiTestCaseInfo> findApiTestCaseBLOBs(ApiTestCaseRequest request) {
         List<String> ids = request.getIds();
         if (request.isSelectAll()) {
+            request.setIds(null);
             ids = this.idSimple(request);
             ids.removeAll(request.getUnSelectIds());
             request.setIds(ids);
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 484bb333b0..2865eee55b 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
@@ -409,12 +409,12 @@
                 </foreach>
             </if>
         </where>
-        <if test="request.orders != null and request.orders.size() > 0">
-            order by
-            <foreach collection="request.orders" separator="," item="order">
-                ${order.name} ${order.type}
-            </foreach>
-        </if>
+<!--        <if test="request.orders != null and request.orders.size() > 0">-->
+<!--            order by-->
+<!--            <foreach collection="request.orders" separator="," item="order">-->
+<!--                ${order.name} ${order.type}-->
+<!--            </foreach>-->
+<!--        </if>-->
     </select>
     <select id="selectIdsNotExistsInPlan" resultType="java.lang.String">
         select c.id
diff --git a/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue b/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
index f3253d09e7..75036ec946 100644
--- a/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
@@ -310,7 +310,14 @@ export default {
     },
     getConditions() {
       let sampleSelectRows = this.$refs.table.getSelectRows();
-      let param = buildBatchParam(this);
+      let batchParam = buildBatchParam(this);
+      let param = {};
+      if(batchParam.condition){
+        param = batchParam.condition;
+        param.projectId = batchParam.projectId;
+      }else{
+        param = batchParam;
+      }
       param.ids = Array.from(sampleSelectRows).map(row => row.id);
       return param;
     }