From 74cd21ce5ef7b57091100bd010510fded38d8ef6 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 10 Jun 2021 15:52:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9F=A5=E7=9C=8B=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestPlanLoadCaseMapper.xml    | 17 +++++++++++------
 .../comonents/load/TestPlanLoadCaseList.vue     |  1 +
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml
index 523b0446fa..3a3fb8f172 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml
@@ -70,12 +70,17 @@
         <if test="request.orders != null and request.orders.size() > 0">
             order by
             <foreach collection="request.orders" separator="," item="order">
-                <if test="order.name == 'num'">
-                    lt.${order.name} ${order.type}
-                </if>
-                <if test="order.name != 'num'">
-                    tplc.${order.name} ${order.type}
-                </if>
+                <choose>
+                    <when test="order.name == 'num'">
+                        lt.${order.name} ${order.type}
+                    </when>
+                    <when test="order.name == 'case_name'">
+                        lt.name ${order.type}
+                    </when>
+                    <otherwise>
+                        tplc.${order.name} ${order.type}
+                    </otherwise>
+                </choose>
             </foreach>
         </if>
     </select>
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
index 7df61988c4..a4c38ccb17 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
@@ -36,6 +36,7 @@
               prop="caseName"
               :label="$t('commons.name')"
               min-width="120"
+              sortable
               show-overflow-tooltip
               :key="index">
           </el-table-column>