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

[Update] 恢复到原来的sql (#3707)

Browse Source
This commit is contained in:
老广
2020-02-15 20:49:20 +08:00
committed by GitHub
parent 5f61f2b555
commit 8b8b11ce1e
6 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/perms/models/base.py
View File

@@ -8,7 +8,7 @@ from django.db.models import Q
from django.utils import timezone
from orgs.mixins.models import OrgModelMixin
from common.utils import date_expired_default, union_queryset
from common.utils import date_expired_default
from orgs.mixins.models import OrgManager
@@ -83,8 +83,7 @@ class BasePermission(OrgModelMixin):
from users.models import User
users_id = self.users.all().values_list('id', flat=True)
groups_id = self.user_groups.all().values_list('id', flat=True)
users = User.objects.filter(id__in=users_id)
if groups_id:
groups_users = User.objects.filter(groups__id__in=groups_id)
users = union_queryset(users, groups_users)
users = User.objects.filter(
Q(id__in=users_id) | Q(groups__id__in=groups_id)
).distinct()
return users