github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-08 02:39:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10655 from jumpserver/pr@dev@fix_login_acl_uniq

Browse Source 
perf: 优化 LoginACL 迁移，避免 uniq error
This commit is contained in:
老广
2023-06-08 18:35:23 +08:00
committed by GitHub
parent 2837dcf40e 998505e999
commit 8f8e781376
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/acls/models/base.py
View File

@@ -90,7 +90,7 @@ class UserBaseACL(BaseACL):
queryset = cls.objects.all()
q = cls.users.get_filter_q(user)
queryset = queryset.filter(q)
return queryset.valid().distinct()
return queryset.filter(is_active=True).distinct()
class UserAssetAccountBaseACL(OrgModelMixin, UserBaseACL):
@@ -125,4 +125,4 @@ class UserAssetAccountBaseACL(OrgModelMixin, UserBaseACL):
kwargs['org_id'] = org_id
if kwargs:
queryset = queryset.filter(**kwargs)
return queryset.valid().distinct().order_by('priority', 'date_created')
return queryset.filter(is_active=True).distinct().order_by('priority', 'date_created')