From 18b197470c252bffd173eb9b59ddce0c5b9d6134 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 24 May 2021 11:19:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E8=87=AA=E5=AE=9A=E4=B9=89ID=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml | 2 +-
 .../io/metersphere/track/issue/AbstractIssuePlatform.java   | 5 +----
 .../{V83__v.1.10.0_release.sql => V85__v.1.10_add_num.sql}  | 0
 .../components/track/case/components/IssueRelateList.vue    | 6 +++++-
 .../track/case/components/TestCaseIssueRelate.vue           | 6 +++++-
 5 files changed, 12 insertions(+), 7 deletions(-)
 rename backend/src/main/resources/db/migration/{V83__v.1.10.0_release.sql => V85__v.1.10_add_num.sql} (100%)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
index fbfcf4710c..a1264b7f40 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
@@ -24,7 +24,7 @@
         SELECT * FROM issues WHERE issues.project_id = #{projectId} ORDER BY num DESC LIMIT 1;
     </select>
     <select id="getRelateIssues" resultType="io.metersphere.base.domain.IssuesDao">
-        select issues.id, issues.title, issues.project_id, issues.create_time, issues.update_time,
+        select issues.id, issues.num, issues.title, issues.project_id, issues.create_time, issues.update_time,
         issues.description, issues.status, issues.platform, issues.custom_fields,
         issues.lastmodify
         from issues
diff --git a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
index e0b126ca30..e70194c7d1 100644
--- a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
@@ -1,10 +1,7 @@
 package io.metersphere.track.issue;
 
 import com.alibaba.fastjson.JSONArray;
-import io.metersphere.base.domain.IssuesWithBLOBs;
-import io.metersphere.base.domain.ServiceIntegration;
-import io.metersphere.base.domain.TestCaseIssues;
-import io.metersphere.base.domain.TestCaseIssuesExample;
+import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.IssuesMapper;
 import io.metersphere.base.mapper.TestCaseIssuesMapper;
 import io.metersphere.base.mapper.ext.ExtIssuesMapper;
diff --git a/backend/src/main/resources/db/migration/V83__v.1.10.0_release.sql b/backend/src/main/resources/db/migration/V85__v.1.10_add_num.sql
similarity index 100%
rename from backend/src/main/resources/db/migration/V83__v.1.10.0_release.sql
rename to backend/src/main/resources/db/migration/V85__v.1.10_add_num.sql
diff --git a/frontend/src/business/components/track/case/components/IssueRelateList.vue b/frontend/src/business/components/track/case/components/IssueRelateList.vue
index a3a8106c01..eca870b315 100644
--- a/frontend/src/business/components/track/case/components/IssueRelateList.vue
+++ b/frontend/src/business/components/track/case/components/IssueRelateList.vue
@@ -18,7 +18,11 @@
 
       <ms-table-column
         :label="$t('test_track.issue.id')"
-        prop="id">
+        prop="id" v-if="false">
+      </ms-table-column>
+      <ms-table-column
+        :label="$t('test_track.issue.id')"
+        prop="num">
       </ms-table-column>
 
       <ms-table-column
diff --git a/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue b/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
index b5c4f63beb..7e56baf337 100644
--- a/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
@@ -17,7 +17,11 @@
 
       <ms-table-column
         :label="$t('test_track.issue.id')"
-        prop="id">
+        prop="id" v-if="false">
+      </ms-table-column>
+      <ms-table-column
+        :label="$t('test_track.issue.id')"
+        prop="num">
       </ms-table-column>
 
       <ms-table-column