From e6d845ae5590cc7584fee6e65e63cbfa63a6906d Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 1 Nov 2022 16:18:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A9=BA=E5=BA=93=20m?=
 =?UTF-8?q?igrate=20=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/orgs/mixins/models.py | 2 +-
 apps/orgs/utils.py         | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/orgs/mixins/models.py b/apps/orgs/mixins/models.py
index 80674ddc6..0795edc2e 100644
--- a/apps/orgs/mixins/models.py
+++ b/apps/orgs/mixins/models.py
@@ -60,7 +60,7 @@ class OrgModelMixin(models.Model):
     sep = '@'
 
     def save(self, *args, **kwargs):
-        locking_org = getattr(self, 'locking_org', None)
+        locking_org = getattr(self, 'LOCKING_ORG', None)
         if locking_org:
             org = Organization.get_instance(locking_org)
         else:
diff --git a/apps/orgs/utils.py b/apps/orgs/utils.py
index a80c7854d..3c2509f6a 100644
--- a/apps/orgs/utils.py
+++ b/apps/orgs/utils.py
@@ -105,12 +105,11 @@ def tmp_to_builtin_org(system=0, default=0):
 
 def filter_org_queryset(queryset):
     locking_org = getattr(queryset.model, 'LOCKING_ORG', None)
-    if locking_org:
-        org = Organization.get_instance(locking_org)
-    else:
-        org = get_current_org()
+    org = get_current_org()
 
-    if org is None:
+    if locking_org:
+        kwargs = {'org_id': locking_org}
+    elif org is None:
         kwargs = {}
     elif org.is_root():
         kwargs = {}