From 8854cba5ff535b587644c6d39139974ff53fc6c8 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Thu, 19 Sep 2024 11:55:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=85=B3=E8=81=94=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1046624 --user=宋昌昌 【测试计划】用户没有测试计划的执行权限-进入计划详情-功能/接口/场景用例列表-批量勾选用例-不应该显示「新建缺陷」「关联缺陷」 https://www.tapd.cn/55049933/s/1580889
---
 .../java/io/metersphere/bug/controller/BugController.java     | 4 ++--
 .../src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml  | 3 ++-
 .../main/java/io/metersphere/bug/service/BugSyncService.java  | 2 +-
 .../testPlan/detail/featureCase/components/caseTable.vue      | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/controller/BugController.java b/backend/services/bug-management/src/main/java/io/metersphere/bug/controller/BugController.java
index 372ca4d241..1955e57c0f 100644
--- a/backend/services/bug-management/src/main/java/io/metersphere/bug/controller/BugController.java
+++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/controller/BugController.java
@@ -146,7 +146,7 @@ public class BugController {
     }
 
     @GetMapping("/sync/{projectId}")
-    @Operation(summary = "缺陷管理-列表-同步存量缺陷")
+    @Operation(summary = "缺陷管理-列表-同步缺陷")
     @RequiresPermissions(PermissionConstants.PROJECT_BUG_UPDATE)
     @CheckOwner(resourceId = "#projectId", resourceType = "project")
     public void sync(@PathVariable String projectId) {
@@ -154,7 +154,7 @@ public class BugController {
     }
 
     @PostMapping("/sync/all")
-    @Operation(summary = "缺陷管理-列表-同步全量缺陷")
+    @Operation(summary = "缺陷管理-列表-同步缺陷(区间)")
     @RequiresPermissions(PermissionConstants.PROJECT_BUG_UPDATE)
     @CheckOwner(resourceId = "#request.getProjectId()", resourceType = "project")
     public void syncAll(@RequestBody BugSyncRequest request) {
diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml
index e175c7d16e..8687424058 100644
--- a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml
+++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml
@@ -15,7 +15,8 @@
 
     <select id="list" resultMap="BugDTO">
         select b.id, b.num, b.title, b.handle_user, b.create_user, b.create_time, b.update_user, b.update_time, b.delete_user, b.delete_time,
-               b.project_id, b.template_id, b.platform, b.status, b.tags from bug b
+               b.project_id, b.template_id, b.platform, b.status, b.tags, bc.description from bug b
+        left join bug_content bc on b.id = bc.bug_id
         <include refid="queryWhereCondition"/>
         <if test="sort != null and sort != ''">
             order by ${sort}
diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugSyncService.java b/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugSyncService.java
index a4251234b3..766f0371cc 100644
--- a/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugSyncService.java
+++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugSyncService.java
@@ -71,7 +71,7 @@ public class BugSyncService {
     }
 
     /**
-     * 同步存量缺陷
+     * 同步缺陷
      * @param projectId 项目ID
      */
     public void syncBugs(String projectId, String currentUser, String language, String triggerMode) {
diff --git a/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTable.vue b/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTable.vue
index bda2950d99..723e672abe 100644
--- a/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTable.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/featureCase/components/caseTable.vue
@@ -463,7 +463,7 @@
           {
             label: 'caseManagement.featureCase.linkDefect',
             eventTag: 'linkDefect',
-            permission: ['PROJECT_BUG:READ'],
+            permission: ['PROJECT_TEST_PLAN:READ+EXECUTE', 'PROJECT_BUG:READ'],
           },
         ]
       : [];
@@ -494,7 +494,7 @@
         {
           label: 'testPlan.featureCase.noBugDataNewBug',
           eventTag: 'newBug',
-          permission: ['PROJECT_BUG:READ+ADD'],
+          permission: ['PROJECT_TEST_PLAN:READ+EXECUTE', 'PROJECT_BUG:READ+ADD'],
         },
       ],
     };