From e2126ff0b76aa23f9df6d1bbf50611698ab0cc5a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 26 Jun 2023 09:45:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=88=91=E7=9A=84=E4=BB=BB=E5=8A=A12?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/supervision/views.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index 9693a79..b79ca3c 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -544,15 +544,9 @@ class Task2DoViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet): 我的任务 """ - queryset = Task2Do.objects.exclude(task2__state=10).order_by('-create_time') - query_params = self.request.query_params - belong_dept = query_params.pop('belong_dept', None) - if belong_dept: - queryset = queryset.filter(belong_dept=belong_dept) - else: - mydept = request.user.dept - belong_depts = get_child_queryset2(mydept) - queryset = queryset.filter(belong_dept__in = belong_depts) + mydept = request.user.dept + belong_depts = get_child_queryset2(mydept) + queryset = Task2Do.objects.filter(belong_dept__in = belong_depts).exclude(task2__state=10).order_by('-create_time') queryset = self.filter_queryset(queryset) page = self.paginate_queryset(queryset) if page is not None: