File tree Expand file tree Collapse file tree 1 file changed +4
-1
lines changed
apps/common/auth/handle/impl Expand file tree Collapse file tree 1 file changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -155,7 +155,9 @@ def get_permission_list(user,
155155 role_permission_mapping_list = QuerySet (role_permission_mapping_model ).filter (
156156 role_id__in = [workspace_user_role_mapping .role_id for workspace_user_role_mapping in
157157 workspace_user_role_mapping_list ])
158- role_permission_mapping_dict = group_by (role_permission_mapping_list , lambda item : item .role_id )
158+ system_role_permission_mapping_list = get_default_role_permission_mapping_list ()
159+ role_permission_mapping_dict = group_by (
160+ [* role_permission_mapping_list , * system_role_permission_mapping_list ], lambda item : item .role_id )
159161
160162 workspace_user_permission_list = QuerySet (WorkspaceUserResourcePermission ).filter (
161163 workspace_id__in = [workspace_user_role .workspace_id for workspace_user_role in
@@ -224,6 +226,7 @@ def get_role_list(user,
224226 workspace_user_role_mapping in
225227 workspace_user_role_mapping_list ] + [user .role ]
226228 cache .set (key , workspace_list , version = version )
229+ return workspace_list
227230 else :
228231 role_list = [user .role ]
229232 if user .role == RoleConstants .ADMIN .value .__str__ ():
You can’t perform that action at this time.
0 commit comments