From 3513a43e1484727fbbed33439403187adbfe6cbe Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Wed, 23 Feb 2022 14:59:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=88=91=E7=9A=84=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E5=8F=B0):=20=E4=BF=AE=E5=A4=8D=E6=88=91=E7=9A=84=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=98=E6=89=80=E5=B1=9E=E9=A1=B9=E7=9B=AE=E5=88=97?=
 =?UTF-8?q?=E4=B8=8D=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1010430--user=郭雨琦
修复我的仪表盘所属项目列不回显问题
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001010430

Closes #10791
---
 .../base/mapper/ext/ExtIssuesMapper.xml            |  3 +++
 .../metersphere/track/service/TestCaseService.java | 14 +++++++++-----
 frontend/src/business/components/xpack             |  2 +-
 3 files changed, 13 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 6571fa0433..0d31986a96 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
@@ -46,6 +46,9 @@
     <select id="getIssues" resultType="io.metersphere.base.domain.IssuesDao">
         select
         <include refid="Issue_List_Column"/>
+        <if test="request.projectId != null||request.workspaceId != null">
+            , project.name as projectName
+        </if>
         from issues
         <if test="request.projectId != null||request.workspaceId != null">
             left join
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 37bf75d98e..e3a85ccd35 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -22,7 +22,6 @@ import io.metersphere.base.mapper.ext.ExtTestCaseMapper;
 import io.metersphere.commons.constants.IssueRefType;
 import io.metersphere.commons.constants.TestCaseConstants;
 import io.metersphere.commons.constants.TestCaseReviewStatus;
-import io.metersphere.commons.constants.UserGroupType;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.*;
@@ -124,10 +123,6 @@ public class TestCaseService {
     @Resource
     TestCaseTestMapper testCaseTestMapper;
     @Resource
-    private GroupMapper groupMapper;
-    @Resource
-    private UserGroupMapper userGroupMapper;
-    @Resource
     private LoadTestMapper loadTestMapper;
     @Resource
     private ApiScenarioMapper apiScenarioMapper;
@@ -549,11 +544,20 @@ public class TestCaseService {
         buildUserInfo(list);
         if (StringUtils.isNotBlank(request.getProjectId())) {
             buildProjectInfo(request.getProjectId(), list);
+        }else{
+            buildProjectInfoWidthoutProject(list);
         }
         list = this.parseStatus(list);
         return list;
     }
 
+    private void buildProjectInfoWidthoutProject(List<TestCaseDTO> resList) {
+        resList.forEach(i -> {
+            Project project = projectMapper.selectByPrimaryKey(i.getProjectId());
+            i.setProjectName(project.getName());
+        });
+    }
+
     public List<TestCaseDTO> publicListTestCase(QueryTestCaseRequest request) {
         this.initRequest(request, true);
         setDefaultOrder(request);
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 938368d436..e99b58ef65 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 938368d43648ff6d0cae3dd1465e06a74fba29f5
+Subproject commit e99b58ef6511288a8665a1baf427c1b799339f70