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

perf: 优化禁用用户

Browse Source
This commit is contained in:
ibuler
2023-10-10 17:39:41 +08:00
committed by 老广
parent 0d101bc5ad
commit affa562384
5 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/audits/api.py
View File

@@ -185,6 +185,8 @@ class ResourceActivityAPIView(generics.ListAPIView):
'r_user', 'r_action', 'r_type'
)
org_q = Q(org_id=Organization.SYSTEM_ID) | Q(org_id=current_org.id)
if resource_id:
org_q |= Q(org_id='') | Q(org_id=Organization.ROOT_ID)
with tmp_to_root_org():
qs1 = self.get_operate_log_qs(fields, limit, org_q, resource_id=resource_id)
qs2 = self.get_activity_log_qs(fields, limit, org_q, resource_id=resource_id)