From 53cc6eb8ce73ab87218dc4e42e3c629181db44d2 Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Tue, 22 Oct 2024 16:28:08 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-fastapi-backend/module_admin/dao/config_dao.py | 1 + ruoyi-fastapi-backend/module_admin/dao/dict_dao.py | 1 + ruoyi-fastapi-backend/module_admin/dao/job_dao.py | 1 + ruoyi-fastapi-backend/module_admin/dao/job_log_dao.py | 3 ++- ruoyi-fastapi-backend/module_admin/dao/notice_dao.py | 1 + ruoyi-fastapi-backend/module_admin/dao/user_dao.py | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ruoyi-fastapi-backend/module_admin/dao/config_dao.py b/ruoyi-fastapi-backend/module_admin/dao/config_dao.py index 7b3c067..4f34a2f 100644 --- a/ruoyi-fastapi-backend/module_admin/dao/config_dao.py +++ b/ruoyi-fastapi-backend/module_admin/dao/config_dao.py @@ -71,6 +71,7 @@ class ConfigDao: if query_object.begin_time and query_object.end_time else True, ) + .order_by(SysConfig.config_id) .distinct() ) config_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) diff --git a/ruoyi-fastapi-backend/module_admin/dao/dict_dao.py b/ruoyi-fastapi-backend/module_admin/dao/dict_dao.py index 8f4aab2..c5a8ed5 100644 --- a/ruoyi-fastapi-backend/module_admin/dao/dict_dao.py +++ b/ruoyi-fastapi-backend/module_admin/dao/dict_dao.py @@ -84,6 +84,7 @@ class DictTypeDao: if query_object.begin_time and query_object.end_time else True, ) + .order_by(SysDictType.dict_id) .distinct() ) dict_type_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) diff --git a/ruoyi-fastapi-backend/module_admin/dao/job_dao.py b/ruoyi-fastapi-backend/module_admin/dao/job_dao.py index 7f4f4a3..805d460 100644 --- a/ruoyi-fastapi-backend/module_admin/dao/job_dao.py +++ b/ruoyi-fastapi-backend/module_admin/dao/job_dao.py @@ -69,6 +69,7 @@ class JobDao: SysJob.job_group == query_object.job_group if query_object.job_group else True, SysJob.status == query_object.status if query_object.status else True, ) + .order_by(SysJob.job_id) .distinct() ) job_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) diff --git a/ruoyi-fastapi-backend/module_admin/dao/job_log_dao.py b/ruoyi-fastapi-backend/module_admin/dao/job_log_dao.py index 730be5a..586a3d6 100644 --- a/ruoyi-fastapi-backend/module_admin/dao/job_log_dao.py +++ b/ruoyi-fastapi-backend/module_admin/dao/job_log_dao.py @@ -1,5 +1,5 @@ from datetime import datetime, time -from sqlalchemy import delete, select +from sqlalchemy import delete, desc, select from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.orm import Session from module_admin.entity.do.job_do import SysJobLog @@ -35,6 +35,7 @@ class JobLogDao: if query_object.begin_time and query_object.end_time else True, ) + .order_by(desc(SysJobLog.create_time)) .distinct() ) job_log_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) diff --git a/ruoyi-fastapi-backend/module_admin/dao/notice_dao.py b/ruoyi-fastapi-backend/module_admin/dao/notice_dao.py index 961a992..9f48a14 100644 --- a/ruoyi-fastapi-backend/module_admin/dao/notice_dao.py +++ b/ruoyi-fastapi-backend/module_admin/dao/notice_dao.py @@ -72,6 +72,7 @@ class NoticeDao: if query_object.begin_time and query_object.end_time else True, ) + .order_by(SysNotice.notice_id) .distinct() ) notice_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) diff --git a/ruoyi-fastapi-backend/module_admin/dao/user_dao.py b/ruoyi-fastapi-backend/module_admin/dao/user_dao.py index 52a088c..cc53566 100644 --- a/ruoyi-fastapi-backend/module_admin/dao/user_dao.py +++ b/ruoyi-fastapi-backend/module_admin/dao/user_dao.py @@ -318,6 +318,7 @@ class UserDao: and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == '0', SysDept.del_flag == '0'), isouter=True, ) + .order_by(SysUser.user_id) .distinct() ) user_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)