From 555e14dc283a221736db95e62fe3364e4e4b6e15 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Thu, 22 Sep 2022 15:53:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1ID=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1016674 --user=宋昌昌 【测试跟踪】github #17805，用例评审关联的功能测试用例列表按ID排序的显示结果和功能用例列表不一致 https://www.tapd.cn/55049933/s/1250441
---
 .../mapper/ext/ExtTestReviewCaseMapper.xml    |  3 ++
 .../track/case/components/TestCaseList.vue    |  6 ++-
 .../components/TestReviewTestCaseList.vue     | 44 ++++++++++++++++---
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
index b45fe51755..8bb9c97cec 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestReviewCaseMapper.xml
@@ -115,6 +115,9 @@
                     <when test="order.name == 'custom_num'">
                         test_case.custom_num ${order.type}
                     </when>
+                    <when test="order.name == 'num'">
+                        test_case.num ${order.type}
+                    </when>
                     <when test="order.name == 'priority'">
                         test_case.priority ${order.type}
                     </when>
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 4e04bbfedc..b36b19cf11 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -54,7 +54,8 @@
           v-if="!customNum"
           :field="item"
           :fields-width="fieldsWidth"
-          prop="num"
+          :column-key="'num'"
+          :prop="'num'"
           sortable
           :label="$t('commons.id')"
           min-width="80">
@@ -68,7 +69,8 @@
         <ms-table-column
           v-if="item.id === 'num' && customNum"
           :fields-width="fieldsWidth"
-          prop="customNum"
+          :column-key="'customNum'"
+          :prop="'customNum'"
           sortable
           :label="$t('commons.id')"
           min-width="80">
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
index c22145ed56..3c20e25d97 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
@@ -40,12 +40,31 @@
     >
       <span v-for="item in fields" :key="item.key">
         <ms-table-column
-          v-if="item.id === 'num'"
-          prop="customNum"
-          sortable="custom"
+          v-if="!customNum"
+          :field="item"
           :fields-width="fieldsWidth"
+          :column-key="'num'"
+          :prop="'num'"
+          sortable
           :label="$t('commons.id')"
-          min-width="120px"/>
+          min-width="80">
+          <template v-slot:default="scope">
+            {{ scope.row.num }}
+          </template>
+        </ms-table-column>
+
+        <ms-table-column
+          v-if="item.id === 'num' && customNum"
+          :fields-width="fieldsWidth"
+          :column-key="'customNum'"
+          :prop="'customNum'"
+          sortable
+          :label="$t('commons.id')"
+          min-width="80">
+          <template v-slot:default="scope">
+            {{ scope.row.customNum }}
+          </template>
+        </ms-table-column>
 
         <ms-table-column
           prop="name"
@@ -316,7 +335,13 @@ export default {
     },
     editTestReviewTestCaseOrder() {
       return editTestReviewTestCaseOrder;
-    }
+    },
+    customNum() {
+      return this.$store.state.currentProjectIsCustomNum;
+    },
+    projectId() {
+      return getCurrentProjectID();
+    },
   },
   created() {
     this.condition.orders = getLastTableSortField(this.tableHeaderKey);
@@ -328,6 +353,7 @@ export default {
     this.isTestManagerOrTestUser = true;
     this.initTableHeader();
     this.getVersionOptions();
+    this.getProject();
   },
   methods: {
     nextPage() {
@@ -425,6 +451,14 @@ export default {
       this.initTableData();
       this.$emit('search');
     },
+    getProject() {
+      this.$get('/project_application/get/config/' + this.projectId + "/CASE_CUSTOM_NUM", result => {
+        let data = result.data;
+        if (data) {
+          this.$store.commit('setCurrentProjectIsCustomNum', data.caseCustomNum);
+        }
+      });
+    },
     buildPagePath(path) {
       return path + "/" + this.currentPage + "/" + this.pageSize;
     },