From 083961f2082ffdbc987a2e7ce8dc97e7f3c4a987 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 17 Jun 2021 16:46:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8BID=E6=8E=92=E5=BA=8F=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestPlanTestCaseMapper.xml  | 14 +++++++++++++-
 .../track/case/components/TestCaseList.vue         |  8 ++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index 5bf152714d..72ab407931 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -237,7 +237,19 @@
         left join test_case_node on test_case_node.id = test_case.node_id
         inner join project on project.id = test_case.project_id
         <include refid="queryWhereCondition"/>
-        <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
+        <if test="request.orders != null and request.orders.size() > 0">
+            order by
+            <foreach collection="request.orders" separator="," item="order">
+                <choose>
+                    <when test="order.name == 'custom_num'">
+                     customNum ${order.type}
+                    </when>
+                    <otherwise>
+                     ${order.name} ${order.type}
+                    </otherwise>
+                </choose>
+            </foreach>
+        </if>
     </select>
     <select id="selectIds" resultType="java.lang.String">
         select distinct test_plan_test_case.id as id
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index aa662ddd01..45d5006d28 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -342,7 +342,9 @@ export default {
         this.testCaseTemplate = template;
         this.fields = getTableHeaderWithCustomFields('TRACK_TEST_CASE', this.testCaseTemplate.customFields);
         this.page.result.loading = false;
-        this.$refs.table.reloadTable();
+        if (this.$refs.table) {
+          this.$refs.table.reloadTable();
+        }
         getCustomFieldBatchEditOption(template.customFields, this.typeArr, this.valueArr, this.members);
       });
     },
@@ -418,7 +420,9 @@ export default {
           let data = response.data;
           this.page.total = data.itemCount;
           this.page.data = data.listObject;
-          this.$refs.table.clear();
+          if (this.$refs.table) {
+            this.$refs.table.clear();
+          }
           this.page.data.forEach(item => {
             if (item.customFields) {
               item.customFields = JSON.parse(item.customFields);