From 601a48071f72d902dd8fde5629a96f4b39f24c78 Mon Sep 17 00:00:00 2001 From: xinwen Date: Wed, 14 Jul 2021 13:53:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=84=E7=BB=87=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=B8=AD=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/orgs/caches.py | 4 ++-- apps/orgs/signals_handler/cache.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/orgs/caches.py b/apps/orgs/caches.py index cc4f71a2a..febbc64a9 100644 --- a/apps/orgs/caches.py +++ b/apps/orgs/caches.py @@ -54,8 +54,8 @@ class OrgResourceStatisticsCache(OrgRelatedCache): assets_amount = IntegerField() nodes_amount = IntegerField(queryset=Node.objects) - admin_users_amount = IntegerField(queryset=AdminUser.objects) - system_users_amount = IntegerField(queryset=SystemUser.objects) + admin_users_amount = IntegerField(queryset=SystemUser.objects.filter(type=SystemUser.Type.admin)) + system_users_amount = IntegerField(queryset=SystemUser.objects.filter(type=SystemUser.Type.common)) domains_amount = IntegerField(queryset=Domain.objects) gateways_amount = IntegerField(queryset=Gateway.objects) diff --git a/apps/orgs/signals_handler/cache.py b/apps/orgs/signals_handler/cache.py index 96d2a6186..734ad7af0 100644 --- a/apps/orgs/signals_handler/cache.py +++ b/apps/orgs/signals_handler/cache.py @@ -55,8 +55,7 @@ class OrgResourceStatisticsRefreshUtil: Application: ['applications_amount'], Gateway: ['gateways_amount'], Domain: ['domains_amount'], - SystemUser: ['system_users_amount'], - AdminUser: ['admin_users_amount'], + SystemUser: ['system_users_amount', 'admin_users_amount'], Node: ['nodes_amount'], Asset: ['assets_amount'], UserGroup: ['groups_amount'],