From 292bf645332de7a1aee6ce2aaa75a4e37db09497 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Thu, 28 Oct 2021 18:26:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BD=93=E5=89=8D=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml  | 5 ++++-
 .../io/metersphere/base/mapper/ext/ExtIssuesMapper.xml    | 8 +++++++-
 .../io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml  | 5 ++++-
 .../base/mapper/ext/ExtTestCaseReviewMapper.xml           | 3 +++
 .../business/components/common/head/HeaderTopMenus.vue    | 2 +-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index 10dd69c9bb..776a1096b4 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -320,7 +320,7 @@
         LEFT JOIN api_definition_exec_result t2 ON t1.id = t2.resource_id
         LEFT JOIN user deleteUser ON t1.delete_user_id = deleteUser.id
         LEFT JOIN api_definition a on t1.api_definition_id = a.id
-        LEFT JOIN project project ON t1.project_id = project.id
+        LEFT JOIN project ON t1.project_id = project.id
         WHERE 1=1
         <if test="request.protocol != null and request.protocol!=''">
             and a.protocol = #{request.protocol}
@@ -335,6 +335,9 @@
                 <property name="objectKey" value="request.combine.tags"/>
             </include>
         </if>
+        <if test="request.workspaceId != null">
+            AND project.workspace_id = #{request.workspaceId}
+        </if>
         <if test="request.projectId != null and request.projectId!=''">
             and t1.project_id = #{request.projectId}
         </if>
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 20c8ece727..30c4e39615 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
@@ -18,6 +18,10 @@
                issues.creator,issues.resource_id,issues.platform_status,
                issues.lastmodify
         from issues
+        <if test="request.projectId != null||request.workspaceId != null">
+            left join
+            project on issues.project_id = project.id
+        </if>
         <include refid="queryWhereCondition"/>
         and (issues.platform_status != 'delete' or issues.platform_status is NULL)
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
@@ -66,7 +70,9 @@
                       or issues.num LIKE CONCAT('%', #{request.name}, '%')
                     )
             </if>
-
+            <if test="request.workspaceId != null">
+                AND project.workspace_id = #{request.workspaceId}
+            </if>
             <if test="request.projectId != null and request.projectId != ''">
                 and issues.project_id = #{request.projectId}
             </if>
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 9298dde217..5668169fe6 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -180,7 +180,7 @@
         </if>
         from test_case left join user u on test_case.create_user=u.id
         left join user deleteUser on test_case.delete_user_id=deleteUser.id
-        left join project project on test_case.project_id = project.id
+        left join project on test_case.project_id = project.id
         <include refid="queryWhereCondition"/>
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
@@ -384,6 +384,9 @@
                     #{nodeId}
                 </foreach>
             </if>
+            <if test="request.workspaceId != null">
+                AND project.workspace_id = #{request.workspaceId}
+            </if>
             <if test="request.projectId != null">
                 and test_case.project_id = #{request.projectId}
             </if>
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml
index c69bcfbba5..1f86490a8a 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml
@@ -53,6 +53,9 @@
             <if test="request.reviewerId != null">
                 and test_case_review.id in (select test_case_review_users.review_id from test_case_review_users where test_case_review_users.user_id = #{request.reviewerId})
             </if>
+            <if test="request.workspaceId != null">
+                AND project.workspace_id = #{request.workspaceId}
+            </if>
             <if test="request.projectId != null">
                 and test_case_review.project_id = #{request.projectId}
             </if>
diff --git a/frontend/src/business/components/common/head/HeaderTopMenus.vue b/frontend/src/business/components/common/head/HeaderTopMenus.vue
index c0f51f98ca..d68a1dfc9d 100644
--- a/frontend/src/business/components/common/head/HeaderTopMenus.vue
+++ b/frontend/src/business/components/common/head/HeaderTopMenus.vue
@@ -8,7 +8,7 @@
            @select="handleSelect"
            :key="menuKey"
            router>
-    <el-menu-item index="/workstation" v-xpack onselectstart="return false"
+    <el-menu-item index="/workstation"  onselectstart="return false"
                   v-permission="['PROJECT_API_DEFINITION:READ','PROJECT_API_SCENARIO:READ','PROJECT_API_REPORT:READ']">
       {{ $t('commons.my_workstation') }}
     </el-menu-item>