fix: the error in obtaining the document list (#2406)

Author: shaohuzhang1

apps/dataset/serializers/document_serializers.py

@@ -19,7 +19,7 @@
 import openpyxl
 from celery_once import AlreadyQueued
 from django.core import validators
-from django.db import transaction
+from django.db import transaction, models
 from django.db.models import QuerySet, Count
 from django.db.models.functions import Substr, Reverse
 from django.http import HttpResponse
@@ -28,7 +28,7 @@
 from rest_framework import serializers
 from xlwt import Utils
 
-from common.db.search import native_search, native_page_search
+from common.db.search import native_search, native_page_search, get_dynamics_model
 from common.event import ListenerManagement
 from common.event.common import work_thread_pool
 from common.exception.app_exception import AppApiException
@@ -443,11 +443,17 @@ def get_query_set(self):
                     else:
                         query_set = query_set.filter(status__iregex='^[2n]*$')
             order_by = self.data.get('order_by', '')
+            order_by_query_set = QuerySet(model=get_dynamics_model(
+                {'char_length': models.CharField(), 'paragraph_count': models.IntegerField(),
+                 "update_time": models.IntegerField(), 'create_time': models.DateTimeField()}))
             if order_by:
-                query_set = query_set.order_by(order_by)
+                order_by_query_set = order_by_query_set.order_by(order_by)
             else:
-                query_set = query_set.order_by('-create_time', 'id')
-            return query_set
+                order_by_query_set = order_by_query_set.order_by('-create_time', 'id')
+            return {
+                'document_custom_sql': query_set,
+                'order_by_query': order_by_query_set
+            }
 
         def list(self, with_valid=False):
             if with_valid:

apps/dataset/sql/list_document.sql

@@ -1,7 +1,11 @@
+SELECT * from (
 SELECT
 	"document".* ,
 	to_json("document"."meta") as meta,
 	to_json("document"."status_meta") as status_meta,
 	 (SELECT "count"("id") FROM "paragraph" WHERE document_id="document"."id") as "paragraph_count"
 FROM
 	"document" "document"
+${document_custom_sql}
+) temp
+${order_by_query}