diff --git a/ruoyi-fastapi-backend/module_admin/dao/explanation_content_dao.py b/ruoyi-fastapi-backend/module_admin/dao/explanation_content_dao.py index 951ca4c..085aa66 100644 --- a/ruoyi-fastapi-backend/module_admin/dao/explanation_content_dao.py +++ b/ruoyi-fastapi-backend/module_admin/dao/explanation_content_dao.py @@ -1,5 +1,5 @@ from datetime import datetime, time -from sqlalchemy import delete, select, update +from sqlalchemy import delete, select, update, desc from sqlalchemy.ext.asyncio import AsyncSession from module_admin.entity.do.explanation_content_do import ExplanationContent from module_admin.entity.vo.explanation_content_vo import Explanation_contentModel, Explanation_contentPageQueryModel @@ -70,10 +70,10 @@ class Explanation_contentDao: query = ( select(ExplanationContent) .where( - ExplanationContent.title == query_object.title if query_object.title else True, - ExplanationContent.content == query_object.content if query_object.content else True, + # ExplanationContent.title == query_object.title if query_object.title else True, + # ExplanationContent.content == query_object.content if query_object.content else True, ExplanationContent.type == query_object.type if query_object.type else True, - ExplanationContent.spend_time == query_object.spend_time if query_object.spend_time else True, + # ExplanationContent.spend_time == query_object.spend_time if query_object.spend_time else True, ExplanationContent.language == query_object.language if query_object.language else True, ExplanationContent.status == query_object.status if query_object.status else True, ExplanationContent.create_time.between( @@ -89,7 +89,7 @@ class Explanation_contentDao: if query_object.begin_update_time and query_object.end_update_time else True, ) - .order_by(ExplanationContent.explanation_content_id) + .order_by(desc(ExplanationContent.update_time)) .distinct() ) explanation_content_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)