From cffba0c6902476f8f8e018071dbf3e8a626eb6c2 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 23 Nov 2022 10:37:51 +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=A1=E7=94=A8=E4=BE=8B=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=B1=95=E7=A4=BA=E8=87=AA=E5=AE=9A=E4=B9=89ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1019621 --user=陈建星 【测试跟踪】github#19703测试用例自定义ID后，在用例评审列表还显示为系统生成的ID https://www.tapd.cn/55049933/s/1302074
---
 .../service/TestReviewTestCaseService.java    |  8 ++---
 .../components/TestReviewTestCaseList.vue     | 30 +++----------------
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestReviewTestCaseService.java b/test-track/backend/src/main/java/io/metersphere/service/TestReviewTestCaseService.java
index c245216762..977b2d7fb1 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/TestReviewTestCaseService.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/TestReviewTestCaseService.java
@@ -48,15 +48,13 @@ public class TestReviewTestCaseService {
     @Resource
     TestCaseReviewMapper testCaseReviewMapper;
     @Resource
-    io.metersphere.service.TestCaseReviewService testCaseReviewService;
+    TestCaseReviewService testCaseReviewService;
     @Resource
     TestCaseMapper testCaseMapper;
     @Resource
-    io.metersphere.service.TestCaseService testCaseService;
-//    @Resource
-//    ExtTestPlanTestCaseMapper extTestPlanTestCaseMapper;
+    TestCaseService testCaseService;
     @Resource
-    io.metersphere.service.TestCaseCommentService testCaseCommentService;
+    TestCaseCommentService testCaseCommentService;
 
     public List<TestReviewCaseDTO> list(QueryCaseReviewRequest request) {
         request.setOrders(ServiceUtils.getDefaultSortOrder(request.getOrders()));
diff --git a/test-track/frontend/src/business/review/view/components/TestReviewTestCaseList.vue b/test-track/frontend/src/business/review/view/components/TestReviewTestCaseList.vue
index 3594b5f198..197623ecdd 100644
--- a/test-track/frontend/src/business/review/view/components/TestReviewTestCaseList.vue
+++ b/test-track/frontend/src/business/review/view/components/TestReviewTestCaseList.vue
@@ -40,31 +40,12 @@
     >
       <span v-for="item in fields" :key="item.key">
         <ms-table-column
-          v-if="!customNum"
-          :field="item"
+          v-if="item.id == 'num'"
+          prop="customNum"
+          sortable="custom"
           :fields-width="fieldsWidth"
-          :column-key="'num'"
-          :prop="'num'"
-          sortable
           :label="$t('commons.id')"
-          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>
+          min-width="120px"/>
 
         <ms-table-column
           prop="name"
@@ -341,9 +322,6 @@ export default {
     editTestReviewTestCaseOrder() {
       return editTestReviewTestCaseOrder;
     },
-    customNum() {
-      return useStore().currentProjectIsCustomNum;
-    },
     projectId() {
       return getCurrentProjectID();
     },