From 7f1e6f0c568039caec1538259933ced8f78198d0 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 2 Nov 2022 17:09:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E6=8E=92=E5=BA=8F/=E8=AE=B8?= =?UTF-8?q?=E5=8F=AF=E8=AF=81=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/hrm/views.py | 2 +- apps/opm/views.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/hrm/views.py b/apps/hrm/views.py index 8435aead..a75d3c18 100755 --- a/apps/hrm/views.py +++ b/apps/hrm/views.py @@ -226,7 +226,7 @@ class ClockRecordViewSet(ListModelMixin, CustomGenericViewSet): search_fields = ['employee__name', 'employee__number', 'employee__phone'] serializer_class = ClockRecordListSerializer filterset_class = ClockRecordFilterSet - ordering = ['-pk'] + ordering = ['-create_time'] @action(methods=['get'], detail=False, perms_map={'get': '*'}, serializer_class=serializers.Serializer) diff --git a/apps/opm/views.py b/apps/opm/views.py index b2a7f144..8f2bab0e 100644 --- a/apps/opm/views.py +++ b/apps/opm/views.py @@ -19,12 +19,13 @@ from django.core.cache import cache class OplCateViewSet(CustomModelViewSet): - queryset = OplCate.objects.all().order_by('sort') + queryset = OplCate.objects.all() create_serializer_class = OplCateCreateUpdateSerializer update_serializer_class = OplCateCreateUpdateSerializer retrieve_serializer_class = OplCateDetailSerializer serializer_class = OplCateSerializer prefetch_related_fields = ['measure_options', 'risk_options', 'close_options'] + ordering = 'sort' class OperationViewSet(CustomModelViewSet):