Skip to content

Commit a54787f

Browse files
committed
fix: user role
1 parent ec66640 commit a54787f

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

apps/common/auth/handle/impl/user_token.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,12 @@ def get_permission_list(user,
205205
return permission_list
206206

207207

208+
def reset_workspace_role(role, workspace_id):
209+
if role == RoleConstants.ADMIN.value.__str__():
210+
return role
211+
return f"{role}:/WORKSPACE/{workspace_id}"
212+
213+
208214
def get_role_list(user,
209215
workspace_user_role_mapping_model,
210216
workspace_model,
@@ -222,11 +228,11 @@ def get_role_list(user,
222228
if is_query_model:
223229
# 获取工作空间 用户 角色映射数据
224230
workspace_user_role_mapping_list = QuerySet(workspace_user_role_mapping_model).filter(user_id=user.id)
225-
role_list = [
226-
f"{workspace_user_role_mapping.role_id}:/WORKSPACE/{workspace_user_role_mapping.workspace_id}"
227-
for
228-
workspace_user_role_mapping in
229-
workspace_user_role_mapping_list] + [user.role]
231+
role_list = [reset_workspace_role(workspace_user_role_mapping.role_id,
232+
workspace_user_role_mapping.workspace_id)
233+
for
234+
workspace_user_role_mapping in
235+
workspace_user_role_mapping_list] + [user.role]
230236
cache.set(key, workspace_list, version=version)
231237
return role_list
232238
else:

0 commit comments

Comments
 (0)