From c66f366446bb51aa0307a220d1e1395953d3e4a7 Mon Sep 17 00:00:00 2001 From: xinwen Date: Thu, 20 May 2021 17:25:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20default=20=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=94=A8=E6=88=B7=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/orgs/caches.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/orgs/caches.py b/apps/orgs/caches.py index 8b5a61b51..5ca445479 100644 --- a/apps/orgs/caches.py +++ b/apps/orgs/caches.py @@ -78,12 +78,12 @@ class OrgResourceStatisticsCache(OrgRelatedCache): return self.org def compute_users_amount(self): - if self.org.is_root(): - users_amount = User.objects.exclude(role='App').count() - else: - users_amount = OrganizationMember.objects.values( - 'user_id' - ).filter(org_id=self.org.id).distinct().count() + users = User.objects.exclude(role='App') + + if not self.org.is_root(): + users = users.filter(m2m_org_members__org_id=self.org.id) + + users_amount = users.values('id').distinct().count() return users_amount def compute_assets_amount(self):