From ac7f1fc20a7ae573f5429671d167c3be65fa9f1a Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Thu, 31 Jul 2025 10:49:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=9F=A5=E7=9C=8B=E8=AE=B2?= =?UTF-8?q?=E8=A7=A3=E5=86=85=E5=AE=B9=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_admin/dao/explanation_content_dao.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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)