From 06360cbfdaaab5c1b05f94cd73733796d0445a38 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 21 Dec 2021 21:18:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=84=91=E5=9B=BE=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E4=BF=9D=E5=AD=98=E6=8A=A5=E9=94=99=20--bug?=
 =?UTF-8?q?=3D1009066=20--user=3D=E9=99=88=E5=BB=BA=E6=98=9F=20=E3=80=90?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA=E3=80=91=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=B8=AD=EF=BC=8C=E8=84=91=E5=9B=BE=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E7=BC=96=E8=BE=91=E7=BC=BA=E9=99=B7=E5=90=8E=E4=BC=9A?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=96=E6=B6=88=E5=85=B3=E8=81=94=20https:?=
 =?UTF-8?q?//www.tapd.cn/55049933/s/1084596?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/track/issue/AbstractIssuePlatform.java    | 4 +++-
 .../track/request/testcase/IssuesUpdateRequest.java          | 2 ++
 .../components/track/case/components/TestPlanIssueEdit.vue   | 4 ++--
 .../components/track/common/minder/TestCaseMinder.vue        | 2 +-
 .../src/business/components/track/issue/IssueEditDetail.vue  | 5 ++++-
 5 files changed, 12 insertions(+), 5 deletions(-)

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 1dee347300..7be0ab7042 100644
--- a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
@@ -174,7 +174,9 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
     protected void handleIssueUpdate(IssuesUpdateRequest request) {
         request.setUpdateTime(System.currentTimeMillis());
         issuesMapper.updateByPrimaryKeySelective(request);
-        handleTestCaseIssues(request);
+        if (!request.isWithoutTestCaseIssue()) {
+            handleTestCaseIssues(request);
+        }
     }
 
     protected void handleTestCaseIssues(IssuesUpdateRequest issuesRequest) {
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java
index afc96dcafd..58441ff9bc 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java
@@ -28,4 +28,6 @@ public class IssuesUpdateRequest extends IssuesWithBLOBs {
     private boolean thirdPartPlatform;
 
     private List<String> follows;
+
+    private boolean withoutTestCaseIssue; // 不更新用例和缺陷的关联关系
 }
diff --git a/frontend/src/business/components/track/case/components/TestPlanIssueEdit.vue b/frontend/src/business/components/track/case/components/TestPlanIssueEdit.vue
index a2f7373251..2d0a52e35e 100644
--- a/frontend/src/business/components/track/case/components/TestPlanIssueEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestPlanIssueEdit.vue
@@ -7,7 +7,7 @@
     append-to-body
     ref="msEditDialog">
     <template v-slot:default="scope">
-      <issue-edit-detail :plan-id="planId" :case-id="caseId" :is-plan="true" @refresh="refresh" @close="handleClose" ref="issueEditDetail"/>
+      <issue-edit-detail :is-minder="isMinder" :plan-id="planId" :case-id="caseId" :is-plan="true" @refresh="refresh" @close="handleClose" ref="issueEditDetail"/>
     </template>
   </ms-edit-dialog>
 </template>
@@ -31,7 +31,7 @@ export default {
       return getCurrentProjectID();
     }
   },
-  props: ['caseId', 'planId'],
+  props: ['caseId', 'planId', 'isMinder'],
   methods: {
     open(data) {
       this.visible = true;
diff --git a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index 2a09238b9e..3e4b4cf2ec 100644
--- a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -18,7 +18,7 @@
       ref="minder"
     />
     <IssueRelateList :case-id="getCurCaseId()"  @refresh="refreshRelateIssue" ref="issueRelate"/>
-    <test-plan-issue-edit :plan-id="null" :case-id="getCurCaseId()" @refresh="refreshIssue" ref="issueEdit"/>
+    <test-plan-issue-edit :is-minder="true" :plan-id="null" :case-id="getCurCaseId()" @refresh="refreshIssue"  ref="issueEdit"/>
   </div>
 
 </template>
diff --git a/frontend/src/business/components/track/issue/IssueEditDetail.vue b/frontend/src/business/components/track/issue/IssueEditDetail.vue
index b5230a460e..1adf60b3d4 100644
--- a/frontend/src/business/components/track/issue/IssueEditDetail.vue
+++ b/frontend/src/business/components/track/issue/IssueEditDetail.vue
@@ -150,7 +150,8 @@ export default {
       }
     },
     caseId: String,
-    planId: String
+    planId: String,
+    isMinder: Boolean,
   },
   computed: {
     isSystem() {
@@ -293,6 +294,8 @@ export default {
         param.resourceId = this.planId;
       }
 
+      param.withoutTestCaseIssue = this.isMinder;
+
       param.thirdPartPlatform = this.enableThirdPartTemplate;
       return param;
     },