From 51c9a89b1feb958210cbfe80b57f8fa40a948866 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 2 Mar 2021 14:48:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E8=B5=84=E4=BA=A7=E5=88=97=E8=A1=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E6=85=A2=20(#5663?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: xinwen --- apps/perms/utils/asset/permission.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/apps/perms/utils/asset/permission.py b/apps/perms/utils/asset/permission.py index 38a3b929d..c9b1bf51e 100644 --- a/apps/perms/utils/asset/permission.py +++ b/apps/perms/utils/asset/permission.py @@ -6,20 +6,19 @@ from common.utils import get_logger from perms.models import AssetPermission from perms.hands import Asset, User, UserGroup, SystemUser from perms.models.base import BasePermissionQuerySet +from perms.utils.asset.user_permission import get_user_all_asset_perm_ids logger = get_logger(__file__) -def get_asset_system_users_id_with_actions(asset_perm_queryset: BasePermissionQuerySet, asset: Asset): - asset_perms_id = set(asset_perm_queryset.values_list('id', flat=True)) - +def get_asset_system_users_id_with_actions(asset_perm_ids, asset: Asset): nodes = asset.get_nodes() node_keys = set() for node in nodes: ancestor_keys = node.get_ancestor_keys(with_self=True) node_keys.update(ancestor_keys) - queryset = AssetPermission.objects.filter(id__in=asset_perms_id)\ + queryset = AssetPermission.objects.filter(id__in=asset_perm_ids)\ .filter(Q(assets=asset) | Q(nodes__key__in=node_keys)) asset_protocols = asset.protocols_as_dict.keys() @@ -36,10 +35,8 @@ def get_asset_system_users_id_with_actions(asset_perm_queryset: BasePermissionQu def get_asset_system_users_id_with_actions_by_user(user: User, asset: Asset): - queryset = AssetPermission.objects.filter( - Q(users=user) | Q(user_groups__users=user) - ).valid() - return get_asset_system_users_id_with_actions(queryset, asset) + asset_perm_ids = get_user_all_asset_perm_ids(user) + return get_asset_system_users_id_with_actions(asset_perm_ids, asset) def has_asset_system_permission(user: User, asset: Asset, system_user: SystemUser): @@ -51,5 +48,7 @@ def has_asset_system_permission(user: User, asset: Asset, system_user: SystemUse def get_asset_system_users_id_with_actions_by_group(group: UserGroup, asset: Asset): - queryset = AssetPermission.objects.filter(user_groups=group).valid() - return get_asset_system_users_id_with_actions(queryset, asset) + asset_perm_ids = AssetPermission.objects.filter( + user_groups=group + ).valid().values_list('id', flat=True).distinct() + return get_asset_system_users_id_with_actions(asset_perm_ids, asset)