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

fix: 修复新建组织用户列表获取到是全局用户bug (#7776) 

Co-authored-by: feng626 <1304903146@qq.com>
pull/7777/head
fit2bot 2022-03-09 11:17:28 +08:00 committed by GitHub
parent 8ed221ea5a
commit 94e60e180e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -346,20 +346,23 @@ class RoleMixin:
org_admin = Role.BuiltinRole.org_admin.get_role() org_admin = Role.BuiltinRole.org_admin.get_role()
return RoleBinding.get_role_users(org_admin) return RoleBinding.get_role_users(org_admin)
@classmethod @staticmethod
def get_nature_users(cls, queryset=None): def filter_not_service_account(queryset):
if not queryset:
return cls.objects.filter(is_service_account=False)
return queryset.filter(is_service_account=False) return queryset.filter(is_service_account=False)
@classmethod
def get_nature_users(cls):
queryset = cls.objects.all()
return cls.filter_not_service_account(queryset)
@classmethod @classmethod
def get_org_users(cls, org=None): def get_org_users(cls, org=None):
queryset = None queryset = cls.objects.all()
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) queryset = cls.filter_not_service_account(queryset)
return queryset return queryset
def get_all_permissions(self): def get_all_permissions(self):