From 9b9e11ff2bbf79f38e9de9ef8a306c923d22a57c Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Tue, 4 Apr 2023 10:46:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=85=B3=E8=81=94=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=94=A8=E4=BE=8B=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestCaseMapper.xml     |  4 ++--
 .../plan/service/TestPlanService.java         | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 6ee3b252f8..99ec94e4d4 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -1262,14 +1262,14 @@
         left join test_plan_test_case as T2 on test_case.id=T2.case_id and T2.plan_id =#{request.planId}
         <include refid="notInQueryWhereCondition"/>
         and T2.case_id is null
-        order by test_case.`order` desc, test_case.sort desc
+        <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
 
     <select id="getMaintainerMapForPlanRepeat" resultType="io.metersphere.base.domain.TestCase">
         select test_case.id as id, test_case.maintainer as maintainer
         from test_case as test_case
         <include refid="notInQueryWhereCondition"/>
-        order by test_case.`order` desc, test_case.sort desc
+        <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
 
     <select id="getForNodeEdit" resultType="io.metersphere.dto.TestCaseDTO">
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
index f845235513..426c01771a 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
@@ -49,6 +49,7 @@ import io.metersphere.plan.service.remote.ui.PlanTestPlanUiScenarioCaseService;
 import io.metersphere.plan.service.remote.ui.PlanUiAutomationService;
 import io.metersphere.plan.utils.TestPlanReportUtil;
 import io.metersphere.plan.utils.TestPlanRequestUtil;
+import io.metersphere.request.OrderRequest;
 import io.metersphere.request.ScheduleRequest;
 import io.metersphere.service.*;
 import io.metersphere.utils.DiscoveryUtil;
@@ -601,6 +602,15 @@ public class TestPlanService {
         TestPlan testPlan = testPlanMapper.selectByPrimaryKey(request.getPlanId());
         boolean isSelectAll = request.getRequest() != null && request.getRequest().isSelectAll();
         if (isSelectAll) {
+            List<OrderRequest> orders = request.getRequest().getOrders();
+            if (CollectionUtils.isNotEmpty(orders)) {
+                orders.forEach(order -> {
+                    order.setPrefix("test_case");
+                });
+            } else {
+                List<OrderRequest> defaultOrders = getDefaultOrders();
+                request.getRequest().setOrders(defaultOrders);
+            }
             List<TestCase> maintainerMap;
             if (BooleanUtils.isTrue(testPlan.getRepeatCase())) {
                 maintainerMap = extTestCaseMapper.getMaintainerMapForPlanRepeat(request.getRequest());
@@ -731,6 +741,16 @@ public class TestPlanService {
         }
     }
 
+    private List<OrderRequest> getDefaultOrders() {
+        List<OrderRequest> orderRequests = new ArrayList<>();
+        OrderRequest orderRequest = new OrderRequest();
+        orderRequest.setPrefix("test_case");
+        orderRequest.setName("order");
+        orderRequest.setType("desc");
+        orderRequests.add(orderRequest);
+        return orderRequests;
+    }
+
     public List<TestPlan> recentTestPlans(String projectId) {
         return extTestPlanMapper.listRecent(SessionUtils.getUserId(), projectId);
     }