Skip to content

Commit 50dd8fa

Browse files
authored
fix: Paragraph list unsorted (#2411)
1 parent effe37f commit 50dd8fa

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

apps/dataset/serializers/document_serializers.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,10 @@ def one(self, with_valid=False):
712712
self.is_valid(raise_exception=True)
713713
query_set = QuerySet(model=Document)
714714
query_set = query_set.filter(**{'id': self.data.get("document_id")})
715-
return native_search(query_set, select_string=get_file_content(
715+
return native_search({
716+
'document_custom_sql': query_set,
717+
'order_by_query': QuerySet(Document).order_by('-create_time', 'id')
718+
}, select_string=get_file_content(
716719
os.path.join(PROJECT_DIR, "apps", "dataset", 'sql', 'list_document.sql')), with_search_one=True)
717720

718721
def edit(self, instance: Dict, with_valid=False):
@@ -1098,7 +1101,10 @@ def batch_save(self, instance_list: List[Dict], with_valid=True):
10981101
if len(document_model_list) == 0:
10991102
return [], dataset_id
11001103
query_set = query_set.filter(**{'id__in': [d.id for d in document_model_list]})
1101-
return native_search(query_set, select_string=get_file_content(
1104+
return native_search({
1105+
'document_custom_sql': query_set,
1106+
'order_by_query': QuerySet(Document).order_by('-create_time', 'id')
1107+
}, select_string=get_file_content(
11021108
os.path.join(PROJECT_DIR, "apps", "dataset", 'sql', 'list_document.sql')),
11031109
with_search_one=False), dataset_id
11041110

apps/dataset/serializers/paragraph_serializers.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,7 @@ def get_query_set(self):
663663
**{'title__icontains': self.data.get('title')})
664664
if 'content' in self.data:
665665
query_set = query_set.filter(**{'content__icontains': self.data.get('content')})
666+
query_set.order_by('-create_time', 'id')
666667
return query_set
667668

668669
def list(self):

0 commit comments

Comments
 (0)