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

fix: user role (#3319)

Browse Source
This commit is contained in:
shaohuzhang1 2025-06-19 20:29:28 +08:00 committed by GitHub
parent ec66640616
commit ba078a9aab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,6 +205,12 @@ def get_permission_list(user,
return permission_list return permission_list
def reset_workspace_role(role, workspace_id):
if role == RoleConstants.ADMIN.value.__str__():
return role
return f"{role}:/WORKSPACE/{workspace_id}"
def get_role_list(user, def get_role_list(user,
workspace_user_role_mapping_model, workspace_user_role_mapping_model,
workspace_model, workspace_model,
@ -222,11 +228,11 @@ 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)
role_list = [ role_list = [reset_workspace_role(workspace_user_role_mapping.role_id,
f"{workspace_user_role_mapping.role_id}:/WORKSPACE/{workspace_user_role_mapping.workspace_id}" 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] workspace_user_role_mapping_list] + [user.role]
cache.set(key, workspace_list, version=version) cache.set(key, workspace_list, version=version)
return role_list return role_list
else: else: