From 9499a16a8b069e61f29aca4c97e60f3293c79f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= <ibuler@qq.com>
Date: Tue, 27 Nov 2018 11:00:39 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E9=BB=98=E8=AE=A4=E4=B8=AD=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=9C=8B=E5=88=B0=E6=89=80=E6=9C=89=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=20(#2102)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/orgs/models.py    | 10 +++-------
 apps/users/api/user.py |  5 +----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/apps/orgs/models.py b/apps/orgs/models.py
index ca43ea8eb..d6abe1f00 100644
--- a/apps/orgs/models.py
+++ b/apps/orgs/models.py
@@ -68,14 +68,10 @@ class Organization(models.Model):
 
     def get_org_users(self, include_app=False):
         from users.models import User
-        if self.is_default():
-            users = User.objects.filter(orgs__isnull=True)
-        elif not self.is_real():
-            users = User.objects.all()
-        elif self.is_root():
-            users = User.objects.all()
-        else:
+        if self.is_real():
             users = self.users.all()
+        else:
+            users = User.objects.all()
         if not include_app:
             users = users.exclude(role=User.ROLE_APP)
         return users
diff --git a/apps/users/api/user.py b/apps/users/api/user.py
index c01f5b1d3..583a8c557 100644
--- a/apps/users/api/user.py
+++ b/apps/users/api/user.py
@@ -38,10 +38,7 @@ class UserViewSet(IDInFilterMixin, BulkModelViewSet):
     pagination_class = LimitOffsetPagination
 
     def get_queryset(self):
-        queryset = super().get_queryset()
-        if current_org.is_real() or current_org.is_default():
-            org_users = current_org.get_org_users()
-            queryset = queryset.filter(id__in=org_users)
+        queryset = current_org.get_org_users()
         return queryset
 
     def get_permissions(self):