From 435e1c193d87fecbe3d4a400273a404c967cd974 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Wed, 13 Mar 2024 19:04:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E4=BE=8B=E8=AF=A6=E6=83=85=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1036117 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001036117
---
 .../src/main/java/io/metersphere/dto/BugProviderDTO.java      | 3 +++
 .../src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml  | 2 ++
 .../java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml | 2 ++
 .../components/tabContent/tabBug/linkDefectDrawer.vue         | 2 +-
 .../components/tabContent/tabBug/tabDefect.vue                | 4 ++--
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/backend/framework/provider/src/main/java/io/metersphere/dto/BugProviderDTO.java b/backend/framework/provider/src/main/java/io/metersphere/dto/BugProviderDTO.java
index 065524250e..5f3b59e9b6 100644
--- a/backend/framework/provider/src/main/java/io/metersphere/dto/BugProviderDTO.java
+++ b/backend/framework/provider/src/main/java/io/metersphere/dto/BugProviderDTO.java
@@ -46,6 +46,9 @@ public class BugProviderDTO implements Serializable {
     @Schema(description = "标签")
     private List<String> tags;
 
+    @Schema(description = "内容")
+    private String content;
+
     @Schema(description = "创建时间")
     private Long createTime;
 
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 c05b1cde3a..68f3130416 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
@@ -110,11 +110,13 @@
         b.title as name,
         b.handle_user as handleUser,
         createUser.name AS createUser,
+        bc.description AS content,
         b.`status` as status,
         b.tags as tag,
         b.create_time createTime
         FROM
         bug b
+        inner join bug_content bc on  b.id = bc.bug_id
         INNER JOIN user createUser ON b.create_user = createUser.id
         WHERE
         b.deleted = #{deleted}
diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
index 1eaeb7d107..1501ba87d6 100644
--- a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
+++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
@@ -75,11 +75,13 @@
             b.title as name,
             b.handle_user handleUser,
             b.`status`,
+            bc.description as content,
             brc.test_plan_id testPlanId,
             tp.name testPlanName
         FROM
             bug_relation_case brc
                 INNER JOIN bug b ON brc.bug_id = b.id
+                INNER JOIN bug_content bc ON brc.bug_id = bc.bug_id
         left join test_plan tp on brc.test_plan_id = tp.id
         where b.deleted = false
         <include refid="queryWhereConditionByProvider"/>
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue
index 27822e8378..48c11a7ca5 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/linkDefectDrawer.vue
@@ -34,7 +34,7 @@
             <span class="ml-1 text-[rgb(var(--primary-5))]">{{ t('caseManagement.featureCase.preview') }}</span>
             <template #content>
               <div class="max-w-[600px] text-[14px] text-[var(--color-text-1)]">
-                {{ record.name }}
+                {{ record.content }}
               </div>
             </template>
           </a-popover>
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue
index a98622b73a..ed9b7cf5cb 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue
@@ -47,7 +47,7 @@
           <span class="ml-1 text-[rgb(var(--primary-5))]">{{ t('caseManagement.featureCase.preview') }}</span>
           <template #content>
             <div class="max-w-[600px] text-[14px] text-[var(--color-text-1)]">
-              {{ record.name }}
+              {{ record.content }}
             </div>
           </template>
         </a-popover>
@@ -127,7 +127,7 @@
           <span class="ml-1 text-[rgb(var(--primary-5))]">{{ t('caseManagement.featureCase.preview') }}</span>
           <template #content>
             <div class="max-w-[600px] text-[14px] text-[var(--color-text-1)]">
-              {{ record.name }}
+              {{ record.content }}
             </div>
           </template>
         </a-popover>