Update filters style

Author: wu-clan

backend/app/admin/crud/crud_dept.py

@@ -66,7 +66,7 @@ async def get_all(
             filters['status'] = status
 
         data_filtered = await filter_data_permission(db, request)
-        return await self.select_models_order(db, 'sort', None, data_filtered, **filters)
+        return await self.select_models_order(db, 'sort', 'desc', data_filtered, **filters)
 
     async def create(self, db: AsyncSession, obj: CreateDeptParam) -> None:
         """

backend/app/admin/crud/crud_menu.py

@@ -59,12 +59,12 @@ async def get_sidebar(self, db: AsyncSession, superuser: bool, menu_ids: list[in
         :param menu_ids: 菜单 ID 列表
         :return:
         """
-        filters = [self.model.type.in_([0, 1, 3, 4])]
+        filters = {'type__in': [0, 1, 3, 4]}
 
         if not superuser:
-            filters.append(self.model.id.in_(menu_ids))
+            filters['id__in'] = menu_ids
 
-        return await self.select_models_order(db, 'sort', 'asc', *filters)
+        return await self.select_models_order(db, 'sort', 'asc', **filters)
 
     async def create(self, db: AsyncSession, obj: CreateMenuParam) -> None:
         """

backend/app/admin/crud/crud_role.py

@@ -64,7 +64,13 @@ async def get_list(self, name: str | None, status: int | None) -> Select:
             filters['status'] = status
 
         return await self.select_order(
-            'id', load_strategies={'users': 'noload', 'menus': 'noload', 'scopes': 'noload'}, **filters
+            'id',
+            load_strategies={
+                'users': 'noload',
+                'menus': 'noload',
+                'scopes': 'noload',
+            },
+            **filters,
         )
 
     async def get_by_name(self, db: AsyncSession, name: str) -> Role | None:

backend/app/admin/crud/crud_user.py

@@ -171,25 +171,25 @@ async def get_list(self, dept: int | None, username: str | None, phone: str | No
         :param status: 用户状态
         :return:
         """
-        filters = []
+        filters = {}
 
         if dept:
-            filters.append(self.model.dept_id == dept)
+            filters['dept_id'] = dept
         if username:
-            filters.append(self.model.username.like(f'%{username}%'))
+            filters['username__like'] = f'%{username}%'
         if phone:
-            filters.append(self.model.phone.like(f'%{phone}%'))
+            filters['phone_like'] = f'%{phone}%'
         if status is not None:
-            filters.append(self.model.status == status)
+            filters['status'] = status
 
         return await self.select_order(
             'id',
             'desc',
-            *filters,
             load_options=[
                 selectinload(self.model.dept).options(noload(Dept.parent), noload(Dept.children), noload(Dept.users)),
                 selectinload(self.model.roles).options(noload(Role.users), noload(Role.menus), noload(Role.scopes)),
             ],
+            **filters,
         )
 
     async def get_super(self, db: AsyncSession, user_id: int) -> bool:
@@ -291,18 +291,18 @@ async def get_with_relation(
         :param username: 用户名
         :return:
         """
-        filters = []
+        filters = {}
 
         if user_id:
-            filters.append(self.model.id == user_id)
+            filters['id'] = user_id
         if username:
-            filters.append(self.model.username == username)
+            filters['username'] = username
 
         return await self.select_model_by_column(
             db,
-            *filters,
             load_options=[selectinload(self.model.roles).options(selectinload(Role.menus), selectinload(Role.scopes))],
             load_strategies=['dept'],
+            **filters,
         )
 
 

backend/plugin/dict/crud/crud_dict_data.py

@@ -30,14 +30,14 @@ async def get_list(self, label: str | None, value: str | None, status: int | Non
         :param status: 字典状态
         :return:
         """
-        filters = []
+        filters = {}
 
         if label is not None:
-            filters.append(self.model.label.like(f'%{label}%'))
+            filters['label__like'] = f'%{label}%'
         if value is not None:
-            filters.append(self.model.value.like(f'%{value}%'))
+            filters['value__like'] = f'%{value}%'
         if status is not None:
-            filters.append(self.model.status == status)
+            filters['status'] = status
 
         return await self.select_order('id', 'desc', *filters)
 

backend/plugin/dict/crud/crud_dict_type.py

@@ -30,16 +30,16 @@ async def get_list(self, *, name: str | None, code: str | None, status: int | No
         :param status: 字典状态
         :return:
         """
-        filters = []
+        filters = {}
 
         if name is not None:
-            filters.append(self.model.name.like(f'%{name}%'))
+            filters['name__like'] = f'%{name}%'
         if code is not None:
-            filters.append(self.model.code.like(f'%{code}%'))
+            filters['code__like'] = f'%{code}%'
         if status is not None:
-            filters.append(self.model.status == status)
+            filters['status'] = status
 
-        return await self.select_order('id', 'desc', *filters)
+        return await self.select_order('id', 'desc', **filters)
 
     async def get_by_code(self, db: AsyncSession, code: str) -> DictType | None:
         """