From 03ad4124eb21283e68b312b3a5c85f2a6dab24ec Mon Sep 17 00:00:00 2001
From: Bai <baijiangjie@gmail.com>
Date: Wed, 8 Feb 2023 16:44:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B5=84=E4=BA=A7=E6=97=B6=EF=BC=8CLoginACL?=
 =?UTF-8?q?=20QuerySet=20=E4=BC=9A=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E8=A7=84=E5=88=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98(@INPUT=E8=B4=A6=E5=8F=B7=E6=B2=A1=E6=9C=89org=5Fid)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/acls/models/base.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/acls/models/base.py b/apps/acls/models/base.py
index 061fcfd01..4649cd626 100644
--- a/apps/acls/models/base.py
+++ b/apps/acls/models/base.py
@@ -113,14 +113,14 @@ class UserAssetAccountBaseACL(BaseACL, OrgModelMixin):
         org_id = None
         if user:
             queryset = queryset.filter_user(user.username)
-        if asset:
-            org_id = asset.org_id
-            queryset = queryset.filter_asset(asset.name, asset.address)
         if account:
             org_id = account.org_id
             queryset = queryset.filter_account(account.username)
         if account_username:
             queryset = queryset.filter_account(username=account_username)
+        if asset:
+            org_id = asset.org_id
+            queryset = queryset.filter_asset(asset.name, asset.address)
         if org_id:
             kwargs['org_id'] = org_id
         if kwargs: