Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search
This commit is contained in:
commit
25091d49fe
|
|
@ -1,6 +1,7 @@
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.cache import cache
|
from django.core.cache import cache
|
||||||
from django.db.models import Count, Q
|
from django.db.models import Count, Q
|
||||||
|
from django.db.models import query
|
||||||
from django.db.models.query import QuerySet
|
from django.db.models.query import QuerySet
|
||||||
from django.shortcuts import render
|
from django.shortcuts import render
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
|
@ -165,7 +166,12 @@ class TaskViewSet(CreateUpdateCustomMixin, ModelViewSet):
|
||||||
"""
|
"""
|
||||||
我的报送任务
|
我的报送任务
|
||||||
"""
|
"""
|
||||||
queryset = TaskDept.objects.filter(dept=request.user.dept).exclude(task__state='待发布').order_by('-create_time')
|
queryset = TaskDept.objects.exclude(task__state='待发布').order_by('-create_time')
|
||||||
|
mydept = request.user.dept
|
||||||
|
belong_depts = get_child_queryset2(mydept)
|
||||||
|
queryset = queryset.filter(dept__in = belong_depts)
|
||||||
|
dept = self.request.query_params.get('dept', mydept.id)
|
||||||
|
queryset = queryset.filter(dept=dept)
|
||||||
serializer = TaskDeptSerializer(queryset, many=True)
|
serializer = TaskDeptSerializer(queryset, many=True)
|
||||||
return Response(serializer.data)
|
return Response(serializer.data)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue