Skip to content

Commit 348e588

Browse files
committed
refactor: unify workspace ID retrieval in authorization API calls
--bug=1058173 --user=刘瑞斌 【资源授权】工作空间管理员进入资源授权查看提示没有权限,工作空间显示为空 https://www.tapd.cn/62980211/s/1724774
1 parent 6e012e6 commit 348e588

File tree

1 file changed

+8
-5
lines changed
  • ui/src/views/system/resource-authorization

1 file changed

+8
-5
lines changed

ui/src/views/system/resource-authorization/index.vue

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ function submitPermissions() {
244244
})
245245
})
246246
.reduce((pre: any, next: any) => [...pre, ...next], [])
247-
247+
const workspaceId = currentWorkspaceId.value || user.getWorkspaceId() || 'default'
248248
AuthorizationApi.putResourceAuthorization(
249-
currentWorkspaceId.value || 'default',
249+
workspaceId,
250250
currentUser.value,
251251
(route.meta?.resource as string) || 'APPLICATION',
252252
{ user_resource_permission_list: user_resource_permission_list },
@@ -264,7 +264,8 @@ function clickMemberHandle(item: any) {
264264
}
265265
266266
function getMember(id?: string) {
267-
AuthorizationApi.getUserMember(currentWorkspaceId.value || 'default', loading).then((res) => {
267+
const workspaceId = currentWorkspaceId.value || user.getWorkspaceId() || 'default'
268+
AuthorizationApi.getUserMember(workspaceId, loading).then((res) => {
268269
memberList.value = res.data
269270
filterMember.value = res.data
270271
if (memberList.value.length > 0) {
@@ -352,16 +353,18 @@ const dfsFolder = (arr: any[] = [], folderIdMap: any) => {
352353
}
353354
354355
function getFolder() {
356+
const workspaceId = currentWorkspaceId.value || user.getWorkspaceId() || 'default'
355357
return AuthorizationApi.getSystemFolder(
356-
currentWorkspaceId.value || 'default',
358+
workspaceId,
357359
activeData.value.type,
358360
{},
359361
loading,
360362
)
361363
}
362364
function getResourcePermissions(user_id: string) {
365+
const workspaceId = currentWorkspaceId.value || user.getWorkspaceId() || 'default'
363366
return AuthorizationApi.getResourceAuthorization(
364-
currentWorkspaceId.value || 'default',
367+
workspaceId,
365368
user_id,
366369
(route.meta?.resource as string) || 'APPLICATION',
367370
rLoading,

0 commit comments

Comments
 (0)