From db8fff0431667ecdc106c457718e816dfaac8283 Mon Sep 17 00:00:00 2001 From: Wu Clan Date: Wed, 25 Feb 2026 11:21:08 +0800 Subject: [PATCH] Fix query sorting based on model sort column (#1083) --- backend/app/admin/crud/crud_dept.py | 2 +- backend/app/admin/crud/crud_menu.py | 2 +- backend/plugin/dict/crud/crud_dict_data.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/app/admin/crud/crud_dept.py b/backend/app/admin/crud/crud_dept.py index 26bdd3e5..2155a111 100644 --- a/backend/app/admin/crud/crud_dept.py +++ b/backend/app/admin/crud/crud_dept.py @@ -64,7 +64,7 @@ class CRUDDept(CRUDPlus[Dept]): if status is not None: filters['status'] = status - return await self.select_models_order(db, 'sort', 'desc', data_filter, **filters) + return await self.select_models_order(db, 'sort', 'asc', data_filter, **filters) async def create(self, db: AsyncSession, obj: CreateDeptParam) -> None: """ diff --git a/backend/app/admin/crud/crud_menu.py b/backend/app/admin/crud/crud_menu.py index e7e6a0cc..ccb2b612 100644 --- a/backend/app/admin/crud/crud_menu.py +++ b/backend/app/admin/crud/crud_menu.py @@ -47,7 +47,7 @@ class CRUDMenu(CRUDPlus[Menu]): if status is not None: filters['status'] = status - return await self.select_models_order(db, 'sort', **filters) + return await self.select_models_order(db, 'sort', 'asc', **filters) async def get_sidebar(self, db: AsyncSession, menu_ids: list[int] | None) -> Sequence[Menu]: """ diff --git a/backend/plugin/dict/crud/crud_dict_data.py b/backend/plugin/dict/crud/crud_dict_data.py index ca87e2ed..3dbb41ee 100644 --- a/backend/plugin/dict/crud/crud_dict_data.py +++ b/backend/plugin/dict/crud/crud_dict_data.py @@ -76,7 +76,7 @@ class CRUDDictData(CRUDPlus[DictData]): if type_id is not None: filters['type_id'] = type_id - return await self.select_order('id', 'desc', **filters) + return await self.select_order('sort', 'asc', **filters) async def get_by_label_and_type_code(self, db: AsyncSession, label: str, type_code: str) -> DictData | None: """