From 59630d8c514137dcd634dc8067aeeb80d1ca6514 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 26 Jun 2023 09:33:26 +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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index 09de4ad..9693a79 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -545,13 +545,19 @@ class Task2DoViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet): 我的任务 """ queryset = Task2Do.objects.exclude(task2__state=10).order_by('-create_time') - belong_dept = self.request.query_params.get('belong_dept', None) + 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) + queryset = self.filter_queryset(queryset) + page = self.paginate_queryset(queryset) + if page is not None: + serializer = Task2DoSerializer(page, many=True) + return self.get_paginated_response(serializer.data) serializer = Task2DoSerializer(queryset, many=True) return Response(serializer.data)