zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: permission (#3289)

Browse Source
This commit is contained in:
shaohuzhang1 2025-06-18 11:26:21 +08:00 committed by GitHub
parent de22ffabc1
commit a08dd98ffb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/common/auth/handle/impl/user_token.py
View File

@ -218,11 +218,12 @@ def get_role_list(user,
if is_query_model: if is_query_model:
# 获取工作空间 用户 角色映射数据 # 获取工作空间 用户 角色映射数据
workspace_user_role_mapping_list = QuerySet(workspace_user_role_mapping_model).filter(user_id=user.id) workspace_user_role_mapping_list = QuerySet(workspace_user_role_mapping_model).filter(user_id=user.id)
cache.set(key, workspace_list = [
[f"{workspace_user_role_mapping.role_id}:/WORKSPACE/{workspace_user_role_mapping.workspace_id}" f"{workspace_user_role_mapping.role_id}:/WORKSPACE/{workspace_user_role_mapping.workspace_id}"
for for
workspace_user_role_mapping in workspace_user_role_mapping in
workspace_user_role_mapping_list] + [user.role], version=version) workspace_user_role_mapping_list] + [user.role]
cache.set(key, workspace_list, version=version)
else: else:
role_list = [user.role] role_list = [user.role]
if user.role == RoleConstants.ADMIN.value.__str__(): if user.role == RoleConstants.ADMIN.value.__str__():

14
ui/src/utils/permission-api.ts
View File

@ -18,11 +18,13 @@ const workspaceApiMap = {
*/ */
export function loadPermissionApi(type: string) { export function loadPermissionApi(type: string) {
if (hasPermission([EditionConst.IS_EE, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole], 'AND')) { if (hasPermission(EditionConst.IS_EE, 'OR')) {
// 加载企业版工作空间管理员 API if (hasPermission([RoleConst.ADMIN], 'OR')) {
return workspaceApiMap[type] // 加载企业版工作空间管理员 API
} else { return systemApiMap[type]
// 加载系统管理员 API } else if (hasPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole], 'OR')) {
return systemApiMap[type] // 加载系统管理员 API
return workspaceApiMap[type]
}
} }
} }