From a3e8453536ac018f09e876c1c7a84199f29d0cb2 Mon Sep 17 00:00:00 2001
From: RubyLiu <liulubingjava@163.com>
Date: Mon, 29 Jan 2024 19:31:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=8E=B7=E5=8F=96=E6=9D=83=E9=99=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/business/ms-project-select/index.vue  | 9 +++++++--
 frontend/src/components/pure/navbar/index.vue            | 3 ++-
 frontend/src/utils/permission.ts                         | 2 +-
 frontend/src/views/base/no-project/index.vue             | 9 ++++++---
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/business/ms-project-select/index.vue b/frontend/src/components/business/ms-project-select/index.vue
index fe6c9319d1..b7e1db2e61 100644
--- a/frontend/src/components/business/ms-project-select/index.vue
+++ b/frontend/src/components/business/ms-project-select/index.vue
@@ -14,6 +14,7 @@
 <script setup lang="ts">
   import { getProjectList } from '@/api/modules/project-management/project';
   import useAppStore from '@/store/modules/app';
+  import { hasAnyPermission } from '@/utils/permission';
 
   import type { ProjectListItem } from '@/models/setting/project';
 
@@ -44,8 +45,12 @@
 
   onBeforeMount(async () => {
     try {
-      const res = await getProjectList(appStore.getCurrentOrgId);
-      projectList.value = res;
+      if (appStore.currentOrgId && hasAnyPermission(['PROJECT_BASE_INFO:READ'])) {
+        const res = await getProjectList(appStore.getCurrentOrgId);
+        projectList.value = res;
+      } else {
+        projectList.value = [];
+      }
     } catch (error) {
       // eslint-disable-next-line no-console
       console.log(error);
diff --git a/frontend/src/components/pure/navbar/index.vue b/frontend/src/components/pure/navbar/index.vue
index f8621c45c1..9bbfc750de 100644
--- a/frontend/src/components/pure/navbar/index.vue
+++ b/frontend/src/components/pure/navbar/index.vue
@@ -132,6 +132,7 @@
   import useLocale from '@/locale/useLocale';
   import useAppStore from '@/store/modules/app';
   import useUserStore from '@/store/modules/user';
+  import { hasAnyPermission } from '@/utils/permission';
 
   import type { ProjectListItem } from '@/models/setting/project';
 
@@ -153,7 +154,7 @@
 
   async function initProjects() {
     try {
-      if (appStore.currentOrgId) {
+      if (appStore.currentOrgId && hasAnyPermission(['PROJECT_BASE_INFO:READ'])) {
         const res = await getProjectList(appStore.getCurrentOrgId);
         projectList.value = res;
       } else {
diff --git a/frontend/src/utils/permission.ts b/frontend/src/utils/permission.ts
index f186a9524f..f216ced152 100644
--- a/frontend/src/utils/permission.ts
+++ b/frontend/src/utils/permission.ts
@@ -52,7 +52,7 @@ function filterProject(role: UserRole, id: string) {
   return role && role.type === 'PROJECT' && role.scopeId === id;
 }
 function filterOrganization(role: UserRole, id: string) {
-  return role && role.type === 'ORGANIZATION' && role.scopeId === id;
+  return role && role.type === 'ORGANIZATION' && (role.scopeId === id || role.scopeId === 'global');
 }
 function filterSystem(role: UserRole, id: string) {
   return role && role.type === 'SYSTEM' && role.scopeId === id;
diff --git a/frontend/src/views/base/no-project/index.vue b/frontend/src/views/base/no-project/index.vue
index 6cc953a24e..d850de4718 100644
--- a/frontend/src/views/base/no-project/index.vue
+++ b/frontend/src/views/base/no-project/index.vue
@@ -32,7 +32,7 @@
   import { getProjectList, switchProject } from '@/api/modules/project-management/project';
   import { useI18n } from '@/hooks/useI18n';
   import { useAppStore, useUserStore } from '@/store';
-  import { getFirstRouteNameByPermission } from '@/utils/permission';
+  import { getFirstRouteNameByPermission, hasAnyPermission } from '@/utils/permission';
 
   import { SelectValue } from '@/models/projectManagement/menuManagement';
   import type { ProjectListItem } from '@/models/setting/project';
@@ -49,8 +49,11 @@
 
   async function initProjects() {
     try {
-      const res = await getProjectList(appStore.getCurrentOrgId);
-      projectList.value = res;
+      if (appStore.getCurrentOrgId && hasAnyPermission(['PROJECT_BASE_INFO:READ'])) {
+        const res = await getProjectList(appStore.getCurrentOrgId);
+      } else {
+        projectList.value = [];
+      }
     } catch (error) {
       // eslint-disable-next-line no-console
       console.log(error);