From 3c9814191dc16059ac4adf8d01bec1de0a160359 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 8 Aug 2019 18:33:48 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/api/asset_permission.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/apps/perms/api/asset_permission.py b/apps/perms/api/asset_permission.py index 0bbb81e4e..7f87ea768 100644 --- a/apps/perms/api/asset_permission.py +++ b/apps/perms/api/asset_permission.py @@ -124,15 +124,14 @@ class AssetPermissionViewSet(viewsets.ModelViewSet): return queryset if not user: return queryset.none() + kwargs = {} + args = [] + if query_group: + groups = user.groups.all() + args.append(Q(users=user) | Q(user_groups__in=groups)) else: - kwargs = {} - args = [] - if query_group: - groups = user.groups.all() - args.append(Q(users=user) | Q(user_groups__in=groups)) - else: - kwargs["users"] = user - return queryset.filter(*args, **kwargs).distinct() + kwargs["users"] = user + return queryset.filter(*args, **kwargs).distinct() def filter_user_group(self, queryset): user_group_id = self.request.query_params.get('user_group_id')