From 64f721875b40e50ddcffa32e925ab7489cf97336 Mon Sep 17 00:00:00 2001 From: "Jiangjie.Bai" Date: Tue, 22 Feb 2022 18:05:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E8=B5=84=E4=BA=A7=E6=A0=91?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=8F=90=E7=A4=BA=E5=AF=B9=E8=B1=A1=E6=89=BE?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/api/asset/user_permission/mixin.py | 4 ++++ .../asset/user_permission/user_permission_assets/views.py | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/perms/api/asset/user_permission/mixin.py b/apps/perms/api/asset/user_permission/mixin.py index a0fe97ec2..10b46e098 100644 --- a/apps/perms/api/asset/user_permission/mixin.py +++ b/apps/perms/api/asset/user_permission/mixin.py @@ -40,3 +40,7 @@ class RoleUserMixin(PermBaseMixin, _RoleUserMixin): def get(self, request, *args, **kwargs): with tmp_to_root_org(): return super().get(request, *args, **kwargs) + + def get_queryset(self): + with tmp_to_root_org(): + return super().get_queryset() diff --git a/apps/perms/api/asset/user_permission/user_permission_assets/views.py b/apps/perms/api/asset/user_permission/user_permission_assets/views.py index 8a9690e12..64ddb0180 100644 --- a/apps/perms/api/asset/user_permission/user_permission_assets/views.py +++ b/apps/perms/api/asset/user_permission/user_permission_assets/views.py @@ -85,15 +85,15 @@ class MyAllAssetsAsTreeApi(UserAllGrantedAssetsQuerysetMixin, pass -class UserGrantedNodeAssetsForAdminApi(UserGrantedNodeAssetsMixin, - RoleAdminMixin, +class UserGrantedNodeAssetsForAdminApi(RoleAdminMixin, + UserGrantedNodeAssetsMixin, AssetsSerializerFormatMixin, ListAPIView): pass -class MyGrantedNodeAssetsApi(UserGrantedNodeAssetsMixin, - RoleUserMixin, +class MyGrantedNodeAssetsApi(RoleUserMixin, + UserGrantedNodeAssetsMixin, AssetsSerializerFormatMixin, ListAPIView): pass