diff --git a/apps/ecm/views.py b/apps/ecm/views.py index 50d5725e..cd5b2154 100644 --- a/apps/ecm/views.py +++ b/apps/ecm/views.py @@ -120,12 +120,13 @@ class EventViewSet(ListModelMixin, RetrieveModelMixin, CustomGenericViewSet): queryset = queryset.filter(event__handle_user=None) ret['total_count'] = queryset.count() if vdata.get('completed', True): - ret['details'] = list(EventCate.objects.order_by('-priority', 'create_time').annotate(cate=F('id'), cate__name=F('name')).values('cate', 'cate__name')) + ret['details'] = list(EventCate.objects.order_by('-priority', 'create_time').annotate(cate=F('id'), + cate__name=F('name'), cate__trigger=F('trigger')).values('cate', 'cate__name')) for i in ret['details']: i['count'] = queryset.filter(cate__id=i['cate']).count() else: ret['details'] = list(queryset.order_by('-cate__priority', 'cate__create_time').values( - 'cate', 'cate__name').annotate(count=Count('cate'))) + 'cate', 'cate__name', 'cate__trigger').annotate(count=Count('cate'))) return Response(ret)