From 348e588428a22006a8dc496121408d85198f7265 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 7 Jul 2025 17:27:16 +0800
Subject: [PATCH] refactor: unify workspace ID retrieval in authorization API
 calls
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1058173 --user=刘瑞斌 【资源授权】工作空间管理员进入资源授权查看提示没有权限，工作空间显示为空 https://www.tapd.cn/62980211/s/1724774
---
 .../views/system/resource-authorization/index.vue   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ui/src/views/system/resource-authorization/index.vue b/ui/src/views/system/resource-authorization/index.vue
index b9a031dd..b0472d18 100644
--- a/ui/src/views/system/resource-authorization/index.vue
+++ b/ui/src/views/system/resource-authorization/index.vue
@@ -244,9 +244,9 @@ function submitPermissions() {
         })
     })
     .reduce((pre: any, next: any) => [...pre, ...next], [])
-
+  const workspaceId = currentWorkspaceId.value || user.getWorkspaceId() || 'default'
   AuthorizationApi.putResourceAuthorization(
-    currentWorkspaceId.value || 'default',
+    workspaceId,
     currentUser.value,
     (route.meta?.resource as string) || 'APPLICATION',
     { user_resource_permission_list: user_resource_permission_list },
@@ -264,7 +264,8 @@ function clickMemberHandle(item: any) {
 }
 
 function getMember(id?: string) {
-  AuthorizationApi.getUserMember(currentWorkspaceId.value || 'default', loading).then((res) => {
+  const workspaceId = currentWorkspaceId.value || user.getWorkspaceId() || 'default'
+  AuthorizationApi.getUserMember(workspaceId, loading).then((res) => {
     memberList.value = res.data
     filterMember.value = res.data
     if (memberList.value.length > 0) {
@@ -352,16 +353,18 @@ const dfsFolder = (arr: any[] = [], folderIdMap: any) => {
 }
 
 function getFolder() {
+  const workspaceId = currentWorkspaceId.value || user.getWorkspaceId() || 'default'
   return AuthorizationApi.getSystemFolder(
-    currentWorkspaceId.value || 'default',
+    workspaceId,
     activeData.value.type,
     {},
     loading,
   )
 }
 function getResourcePermissions(user_id: string) {
+  const workspaceId = currentWorkspaceId.value || user.getWorkspaceId() || 'default'
   return AuthorizationApi.getResourceAuthorization(
-    currentWorkspaceId.value || 'default',
+    workspaceId,
     user_id,
     (route.meta?.resource as string) || 'APPLICATION',
     rLoading,