@@ -195,7 +195,7 @@ def get_permission_list(user,
195195 else :
196196 workspace_id_list = ['default' ]
197197 workspace_user_resource_permission_list = QuerySet (WorkspaceUserResourcePermission ).filter (
198- workspace_id__in = workspace_id_list )
198+ workspace_id__in = workspace_id_list , user_id = user_id )
199199 role_permission_mapping_list = get_default_role_permission_mapping_list ()
200200 role_permission_mapping_dict = group_by (role_permission_mapping_list , lambda item : item .role_id )
201201 workspace_user_role_mapping_list = get_default_workspace_user_role_mapping_list ([user .role ])
@@ -206,15 +206,8 @@ def get_permission_list(user,
206206 workspace_user_resource_permission_list ,
207207 role_permission_mapping_dict ,
208208 workspace_user_role_mapping_dict )
209-
210- workspace_permission_list = get_workspace_permission_list (role_permission_mapping_dict ,
211- workspace_user_role_mapping_list , {})
212- # 系统权限
213- system_permission_list = [role_permission_mapping .permission_id for role_permission_mapping in
214- role_permission_mapping_list if
215- [user .role ].__contains__ (role_permission_mapping .role_id )]
216209 # 合并权限
217- permission_list = system_permission_list + workspace_permission_list + workspace_resource_permission_list
210+ permission_list = workspace_resource_permission_list
218211 permission_list = list (set (permission_list ))
219212 cache .set (key , permission_list , version = version )
220213 return permission_list
@@ -271,9 +264,10 @@ def get_role_list(user,
271264 cache .set (key , workspace_list , version = version )
272265 return role_list
273266 else :
274- role_list = [user .role ]
275267 if user .role == RoleConstants .ADMIN .value .__str__ ():
276268 role_list = [user .role , get_role_permission (RoleConstants .WORKSPACE_MANAGE , 'default' )]
269+ else :
270+ role_list = [user .role , get_role_permission (RoleConstants .USER , 'default' )]
277271 cache .set (key , role_list , version = version )
278272 return role_list
279273 return workspace_list
0 commit comments