From a868e16d8990e662a1026376111f4a6cba76aa51 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 1 Apr 2021 20:20:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/supervision/views.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py index df80be7..e1f20d3 100644 --- a/server/apps/supervision/views.py +++ b/server/apps/supervision/views.py @@ -216,12 +216,15 @@ class RecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet): queryset = queryset.filter(belong_dept__in = belong_depts) elif '本级' in data_range: queryset = queryset.filter(belong_dept = user.dept) - if not self.request.query_params.get('pageoff', None): - queryset = queryset.exclude(state='待发布') if self.request.query_params.get('only', None) == 'true': queryset = queryset.filter(belong_dept = user.dept) return queryset + def filter_queryset(self, queryset): + if not self.request.query_params.get('pageoff', None): + queryset = queryset.exclude(state='待发布') + return super().filter_queryset(queryset) + @action(methods=['get'], detail=False, perms_map = {'get':'*'}) def todos(self, request, *args, **kwargs): ret={} @@ -234,7 +237,7 @@ class RecordViewSet(PageOrNot, CreateUpdateCustomMixin, ModelViewSet): return Response(ret) def update(self, request, *args, **kwargs): - instance = Record.objects.get(pk=kwargs['pk']) + instance = self.get_object() instance.note = request.data.get('note', None) instance.update_by = request.user instance.save()