From bd783e6a8db9c9bf653ea8f66a62ccce4376e0fc Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Thu, 13 Mar 2025 18:23:33 +0800 Subject: [PATCH] perf: asset perm expire --- apps/perms/filters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/perms/filters.py b/apps/perms/filters.py index 2b054f1da..6fb461629 100644 --- a/apps/perms/filters.py +++ b/apps/perms/filters.py @@ -38,7 +38,7 @@ class PermissionBaseFilter(BaseFilterSet): def filter_expired(queryset, name, is_expired): now = timezone.now() if is_expired: - queryset = queryset.filter(date_start__gt=now).filter(date_expired__lt=now) + queryset = queryset.filter(Q(date_start__gt=now) | Q(date_expired__lt=now)) else: queryset = queryset.filter(Q(date_start__lt=now) | Q(date_expired__gt=now)) return queryset @@ -116,7 +116,7 @@ class AssetPermissionFilter(PermissionBaseFilter): fields = ( 'user_id', 'username', 'user_group_id', 'user_group', 'node_id', 'node_name', 'asset_id', - 'asset_name', 'name', 'ip', 'name', + 'asset_name', 'name', 'ip', 'name', 'is_active', 'all', 'is_valid', 'is_effective', 'from_ticket' )