Browse Source

perf: 优化列表查询排序

master
insistence 3 months ago
parent
commit
53cc6eb8ce
  1. 1
      ruoyi-fastapi-backend/module_admin/dao/config_dao.py
  2. 1
      ruoyi-fastapi-backend/module_admin/dao/dict_dao.py
  3. 1
      ruoyi-fastapi-backend/module_admin/dao/job_dao.py
  4. 3
      ruoyi-fastapi-backend/module_admin/dao/job_log_dao.py
  5. 1
      ruoyi-fastapi-backend/module_admin/dao/notice_dao.py
  6. 1
      ruoyi-fastapi-backend/module_admin/dao/user_dao.py

1
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 if query_object.begin_time and query_object.end_time
else True, else True,
) )
.order_by(SysConfig.config_id)
.distinct() .distinct()
) )
config_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) config_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)

1
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 if query_object.begin_time and query_object.end_time
else True, else True,
) )
.order_by(SysDictType.dict_id)
.distinct() .distinct()
) )
dict_type_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) dict_type_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)

1
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.job_group == query_object.job_group if query_object.job_group else True,
SysJob.status == query_object.status if query_object.status else True, SysJob.status == query_object.status if query_object.status else True,
) )
.order_by(SysJob.job_id)
.distinct() .distinct()
) )
job_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) job_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)

3
ruoyi-fastapi-backend/module_admin/dao/job_log_dao.py

@ -1,5 +1,5 @@
from datetime import datetime, time from datetime import datetime, time
from sqlalchemy import delete, select from sqlalchemy import delete, desc, select
from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from module_admin.entity.do.job_do import SysJobLog 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 if query_object.begin_time and query_object.end_time
else True, else True,
) )
.order_by(desc(SysJobLog.create_time))
.distinct() .distinct()
) )
job_log_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) job_log_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)

1
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 if query_object.begin_time and query_object.end_time
else True, else True,
) )
.order_by(SysNotice.notice_id)
.distinct() .distinct()
) )
notice_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) notice_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)

1
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'), and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == '0', SysDept.del_flag == '0'),
isouter=True, isouter=True,
) )
.order_by(SysUser.user_id)
.distinct() .distinct()
) )
user_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) user_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)

Loading…
Cancel
Save