github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-27 23:56:09 +00:00
Code Issues Projects Releases Wiki Activity

fix: 组织统计里系统用户与特权用户数量不对

Browse Source
This commit is contained in:
xinwen
2021-08-18 16:40:46 +08:00
committed by Jiangjie.Bai
parent 228446979f
commit f9218584f4
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/orgs/caches.py
View File

@@ -54,8 +54,8 @@ class OrgResourceStatisticsCache(OrgRelatedCache):
assets_amount = IntegerField() assets_amount = IntegerField()
nodes_amount = IntegerField(queryset=Node.objects) nodes_amount = IntegerField(queryset=Node.objects)
admin_users_amount = IntegerField(queryset=SystemUser.objects.filter(type=SystemUser.Type.admin)) admin_users_amount = IntegerField()
system_users_amount = IntegerField(queryset=SystemUser.objects.filter(type=SystemUser.Type.common)) system_users_amount = IntegerField()
domains_amount = IntegerField(queryset=Domain.objects) domains_amount = IntegerField(queryset=Domain.objects)
gateways_amount = IntegerField(queryset=Gateway.objects) gateways_amount = IntegerField(queryset=Gateway.objects)
@@ -77,6 +77,12 @@ class OrgResourceStatisticsCache(OrgRelatedCache):
def get_current_org(self): def get_current_org(self):
return self.org return self.org
def compute_admin_users_amount(self):
return SystemUser.objects.filter(type=SystemUser.Type.admin).count()
def compute_system_users_amount(self):
return SystemUser.objects.filter(type=SystemUser.Type.common).count()
def compute_users_amount(self): def compute_users_amount(self):
users = User.objects.exclude(role='App') users = User.objects.exclude(role='App')