From 3222687aaa359f14a71f88d592426b71594e34ca Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Mon, 7 Mar 2022 18:42:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E6=9D=83=E9=99=90bug=20(#7756)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng626 <1304903146@qq.com> --- .../api/application/application_permission_relation.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/perms/api/application/application_permission_relation.py b/apps/perms/api/application/application_permission_relation.py index 1266662d3..611d0930e 100644 --- a/apps/perms/api/application/application_permission_relation.py +++ b/apps/perms/api/application/application_permission_relation.py @@ -23,6 +23,8 @@ __all__ = [ class RelationMixin(OrgRelationMixin, OrgBulkModelViewSet): + perm_model = models.ApplicationPermission + def get_queryset(self): queryset = super().get_queryset() org_id = current_org.org_id() @@ -86,8 +88,8 @@ class ApplicationPermissionSystemUserRelationViewSet(RelationMixin): def get_queryset(self): queryset = super().get_queryset() - queryset = queryset \ - .annotate(systemuser_display=Concat( + queryset = queryset.annotate( + systemuser_display=Concat( F('systemuser__name'), Value('('), F('systemuser__username'), Value(')') )) @@ -103,7 +105,7 @@ class ApplicationPermissionAllApplicationListApi(generics.ListAPIView): def get_queryset(self): pk = self.kwargs.get('pk') perm = get_object_or_404(models.ApplicationPermission, pk=pk) - applications = Application.objects.filter(granted_by_permissions=perm)\ + applications = Application.objects.filter(granted_by_permissions=perm) \ .only(*self.only_fields).distinct() return applications