zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Paragraph list unsorted (#2411)

Browse Source
This commit is contained in:
shaohuzhang1 2025-02-26 11:52:44 +08:00 committed by GitHub
parent effe37fa6c
commit 50dd8fae41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/dataset/serializers/document_serializers.py
View File

@ -712,7 +712,10 @@ class DocumentSerializers(ApiMixin, serializers.Serializer):
self.is_valid(raise_exception=True) self.is_valid(raise_exception=True)
query_set = QuerySet(model=Document) query_set = QuerySet(model=Document)
query_set = query_set.filter(**{'id': self.data.get("document_id")}) query_set = query_set.filter(**{'id': self.data.get("document_id")})
return native_search(query_set, select_string=get_file_content( return native_search({
'document_custom_sql': query_set,
'order_by_query': QuerySet(Document).order_by('-create_time', 'id')
}, select_string=get_file_content(
os.path.join(PROJECT_DIR, "apps", "dataset", 'sql', 'list_document.sql')), with_search_one=True) os.path.join(PROJECT_DIR, "apps", "dataset", 'sql', 'list_document.sql')), with_search_one=True)
def edit(self, instance: Dict, with_valid=False): def edit(self, instance: Dict, with_valid=False):
@ -1098,7 +1101,10 @@ class DocumentSerializers(ApiMixin, serializers.Serializer):
if len(document_model_list) == 0: if len(document_model_list) == 0:
return [], dataset_id return [], dataset_id
query_set = query_set.filter(**{'id__in': [d.id for d in document_model_list]}) query_set = query_set.filter(**{'id__in': [d.id for d in document_model_list]})
return native_search(query_set, select_string=get_file_content( return native_search({
'document_custom_sql': query_set,
'order_by_query': QuerySet(Document).order_by('-create_time', 'id')
}, select_string=get_file_content(
os.path.join(PROJECT_DIR, "apps", "dataset", 'sql', 'list_document.sql')), os.path.join(PROJECT_DIR, "apps", "dataset", 'sql', 'list_document.sql')),
with_search_one=False), dataset_id with_search_one=False), dataset_id

1
apps/dataset/serializers/paragraph_serializers.py
View File

@ -663,6 +663,7 @@ class ParagraphSerializers(ApiMixin, serializers.Serializer):
**{'title__icontains': self.data.get('title')}) **{'title__icontains': self.data.get('title')})
if 'content' in self.data: if 'content' in self.data:
query_set = query_set.filter(**{'content__icontains': self.data.get('content')}) query_set = query_set.filter(**{'content__icontains': self.data.get('content')})
query_set.order_by('-create_time', 'id')
return query_set return query_set
def list(self): def list(self):