zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: 我的任务2修改

This commit is contained in:
caoqianming 2023-06-26 09:33:26 +08:00
parent fd6c8c138e
commit 59630d8c51
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/apps/supervision/views.py
View File

@ -545,13 +545,19 @@ class Task2DoViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
我的任务 我的任务
""" """
queryset = Task2Do.objects.exclude(task2__state=10).order_by('-create_time') 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: if belong_dept:
queryset = queryset.filter(belong_dept=belong_dept) queryset = queryset.filter(belong_dept=belong_dept)
else: else:
mydept = request.user.dept mydept = request.user.dept
belong_depts = get_child_queryset2(mydept) belong_depts = get_child_queryset2(mydept)
queryset = queryset.filter(belong_dept__in = belong_depts) 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) serializer = Task2DoSerializer(queryset, many=True)
return Response(serializer.data) return Response(serializer.data)