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):