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: