From f4537b5bbc67587c6e7fb5f2b512ae0a34f54f5b Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 7 Jul 2021 13:52:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BC=96=E8=BE=91=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=85=B3=E8=81=94=E7=BC=BA=E9=99=B7=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/base/mapper/ext/ExtIssuesMapper.xml     | 4 ++--
 .../io/metersphere/track/controller/IssuesController.java  | 5 +++++
 .../java/io/metersphere/track/service/IssuesService.java   | 7 +++++--
 .../components/track/case/components/IssueRelateList.vue   | 1 +
 .../track/case/components/TestCaseIssueRelate.vue          | 4 ++--
 5 files changed, 15 insertions(+), 6 deletions(-)

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 092f259c41..160132fb68 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
@@ -25,13 +25,13 @@
     </select>
     <select id="getRelateIssues" resultType="io.metersphere.base.domain.IssuesDao">
         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.description, issues.status, issues.platform, issues.custom_fields,test_case_issues.test_case_id,
         issues.lastmodify
         from issues
         left join
         test_case_issues on issues.id = test_case_issues.issues_id
         <include refid="queryWhereCondition"/>
-        and test_case_issues.issues_id is null
+        and (test_case_issues.test_case_id is null or test_case_issues.test_case_id != #{request.caseId})
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
     <select id="getIssueForSync" resultType="io.metersphere.base.domain.IssuesDao">
diff --git a/backend/src/main/java/io/metersphere/track/controller/IssuesController.java b/backend/src/main/java/io/metersphere/track/controller/IssuesController.java
index 16ad0426e6..b3c629af29 100644
--- a/backend/src/main/java/io/metersphere/track/controller/IssuesController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/IssuesController.java
@@ -76,6 +76,11 @@ public class IssuesController {
         issuesService.deleteIssue(request);
     }
 
+    @PostMapping("/delete/relate")
+    public void deleteRelate(@RequestBody IssuesRequest request) {
+        issuesService.deleteIssueRelate(request);
+    }
+
     @GetMapping("/delete/{id}")
     @MsAuditLog(module = "track_bug", type = OperLogConstants.DELETE, beforeEvent = "#msClass.getLogDetails(#id)", msClass = IssuesService.class)
     public void delete(@PathVariable String id) {
diff --git a/backend/src/main/java/io/metersphere/track/service/IssuesService.java b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
index 8a04c6964d..6895e4215b 100644
--- a/backend/src/main/java/io/metersphere/track/service/IssuesService.java
+++ b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
@@ -287,10 +287,13 @@ public class IssuesService {
     }
 
     public void deleteIssue(IssuesRequest request) {
+        issuesMapper.deleteByPrimaryKey(request.getId());
+        deleteIssueRelate(request);
+    }
+
+    public void deleteIssueRelate(IssuesRequest request) {
         String caseId = request.getCaseId();
         String id = request.getId();
-        issuesMapper.deleteByPrimaryKey(id);
-
         TestCaseIssuesExample example = new TestCaseIssuesExample();
         example.createCriteria().andTestCaseIdEqualTo(caseId).andIssuesIdEqualTo(id);
         testCaseIssuesMapper.deleteByExample(example);
diff --git a/frontend/src/business/components/track/case/components/IssueRelateList.vue b/frontend/src/business/components/track/case/components/IssueRelateList.vue
index f8c68f463b..1a34c0f808 100644
--- a/frontend/src/business/components/track/case/components/IssueRelateList.vue
+++ b/frontend/src/business/components/track/case/components/IssueRelateList.vue
@@ -87,6 +87,7 @@ export default {
     },
     getIssues() {
       this.page.condition.projectId = this.projectId;
+      this.page.condition.caseId = this.caseId;
       this.page.result = getRelateIssues(this.page);
     },
     save() {
diff --git a/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue b/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
index 91fadf84ec..6b35bf3305 100644
--- a/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseIssueRelate.vue
@@ -53,7 +53,7 @@
                        @click="closeIssue(scope.row)"
             />
           </el-tooltip>
-          <el-tooltip :content="$t('test_track.issue.delete')"
+          <el-tooltip :content="$t('test_track.case.unlink')"
                       placement="top" :enterable="false">
             <el-button type="danger" icon="el-icon-delete" size="mini"
                        circle :disabled="scope.row.platform !== 'Local'"
@@ -127,7 +127,7 @@ export default {
       }
     },
     deleteIssue(row) {
-      this.page.result = this.$post("/issues/delete", {id: row.id, caseId: this.caseId}, () => {
+      this.page.result = this.$post("/issues/delete/relate", {id: row.id, caseId: this.caseId}, () => {
         this.getIssues();
         this.$success(this.$t('commons.delete_success'));
       })