github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-04 10:36:37 +00:00
Code Issues Projects Releases Wiki Activity

fix: 二级审批通过，一级审批人员查看不到工单 (#12993)

Browse Source 
Co-authored-by: feng <1304903146@qq.com>
This commit is contained in:
fit2bot 2024-04-11 16:35:00 +08:00 committed by GitHub
parent 0c31925131
commit fa5d9d3df4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/tickets/filters.py
View File

@ -1,10 +1,10 @@
from django.db.models import Subquery, OuterRef, Value, F, Q from django.db.models import Value, F, Q
from django.db.models.functions import Concat from django.db.models.functions import Concat
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from common.drf.filters import BaseFilterSet from common.drf.filters import BaseFilterSet
from tickets.models import ( from tickets.models import (
Ticket, TicketStep, ApplyAssetTicket, Ticket, ApplyAssetTicket,
ApplyLoginTicket, ApplyLoginAssetTicket, ApplyCommandTicket ApplyLoginTicket, ApplyLoginAssetTicket, ApplyCommandTicket
) )
@ -22,11 +22,7 @@ class TicketFilter(BaseFilterSet):
) )
def filter_assignees_id(self, queryset, name, value): def filter_assignees_id(self, queryset, name, value):
step_qs = TicketStep.objects.filter(
level=OuterRef("approval_step")
).values_list('id', flat=True)
return queryset.filter( return queryset.filter(
ticket_steps__id__in=Subquery(step_qs),
ticket_steps__ticket_assignees__assignee__id=value ticket_steps__ticket_assignees__assignee__id=value
) )