diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py index 9b5354a..7aba7c6 100644 --- a/hb_server/apps/wf/views.py +++ b/hb_server/apps/wf/views.py @@ -64,7 +64,7 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): 工作流下的自定义字段 """ wf = self.get_object() - serializer = self.serializer_class(instance=CustomField.objects.filter(workflow=wf), many=True) + serializer = self.serializer_class(instance=CustomField.objects.filter(workflow=wf, is_deleted=False).order_by('sort'), many=True) return Response(serializer.data) @action(methods=['get'], detail=True, perms_map={'get':'workflow_init'}) @@ -105,7 +105,7 @@ class TransitionViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, class CustomFieldViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): perms_map = {'*':'*'} - queryset = CustomField.objects.all().order_by('sort') + queryset = CustomField.objects.all() serializer_class = CustomFieldSerializer search_fields = ['field_name'] filterset_fields = ['workflow', 'field_type']