github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 修复特殊用户过滤 (#7759) 

Co-authored-by: feng626 <1304903146@qq.com>
pull/7761/head
fit2bot 2022-03-07 20:09:52 +08:00 committed by GitHub
parent 14327ee398
commit 89de111acc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/users/models/user.py
View File

@ -336,16 +336,19 @@ class RoleMixin:
return RoleBinding.get_role_users(org_admin) return RoleBinding.get_role_users(org_admin)
@classmethod @classmethod
def get_nature_users(cls): def get_nature_users(cls, queryset=None):
return cls.objects.filter(is_service_account=False) if not queryset:
return cls.objects.filter(is_service_account=False)
return queryset.filter(is_service_account=False)
@classmethod @classmethod
def get_org_users(cls, org=None): def get_org_users(cls, org=None):
queryset = cls.get_nature_users() queryset = None
if org is None: if org is None:
org = current_org org = current_org
if not org.is_root(): if not org.is_root():
queryset = current_org.get_members() queryset = current_org.get_members()
queryset = cls.get_nature_users(queryset)
return queryset return queryset
def get_all_permissions(self): def get_all_permissions(self):