Update filter style

Author: wu-clan

backend/app/admin/crud/crud_data_rule.py

@@ -33,7 +33,7 @@ async def get_list(self, name: str | None) -> Select:
         filters = {}
 
         if name is not None:
-            filters.update(name__like=f'%{name}%')
+            filters['name__like'] = f'%{name}%'
 
         return await self.select_order('id', load_strategies={'scopes': 'noload'}, **filters)
 

backend/app/admin/crud/crud_data_scope.py

@@ -63,11 +63,11 @@ async def get_list(self, name: str | None, status: int | None) -> Select:
         filters = {}
 
         if name is not None:
-            filters.update(name__like=f'%{name}%')
+            filters['name__like'] = f'%{name}%'
         if status is not None:
-            filters.update(status=status)
+            filters['status'] = status
 
-        return await self.select_order('id', load_strategies={'rules': 'noload', 'roles': 'noload'})
+        return await self.select_order('id', load_strategies={'rules': 'noload', 'roles': 'noload'}, **filters)
 
     async def create(self, db: AsyncSession, obj: CreateDataScopeParam) -> None:
         """

backend/app/admin/crud/crud_dept.py

@@ -54,16 +54,16 @@ async def get_all(
         :param status: 部门状态
         :return:
         """
-        filters = {'del_flag__eq': 0}
+        filters = {'del_flag': 0}
 
         if name is not None:
-            filters.update(name__like=f'%{name}%')
+            filters['name__like'] = f'%{name}%'
         if leader is not None:
-            filters.update(leader__like=f'%{leader}%')
+            filters['leader__like'] = f'%{leader}%'
         if phone is not None:
-            filters.update(phone__startswith=phone)
+            filters['phone__startswith'] = phone
         if status is not None:
-            filters.update(status=status)
+            filters['status'] = status
 
         data_filtered = await filter_data_permission(db, request)
         return await self.select_models_order(db, 'sort', None, data_filtered, **filters)

backend/app/admin/crud/crud_login_log.py

@@ -23,11 +23,11 @@ async def get_list(self, username: str | None, status: int | None, ip: str | Non
         filters = {}
 
         if username is not None:
-            filters.update(username__like=f'%{username}%')
+            filters['username__like'] = f'%{username}%'
         if status is not None:
-            filters.update(status=status)
+            filters['status'] = status
         if ip is not None:
-            filters.update(ip__like=f'%{ip}%')
+            filters['ip__like'] = f'%{ip}%'
 
         return await self.select_order('created_time', 'desc', **filters)
 

backend/app/admin/crud/crud_menu.py

@@ -44,9 +44,9 @@ async def get_all(self, db: AsyncSession, title: str | None, status: int | None)
         filters = {}
 
         if title is not None:
-            filters.update(title__like=f'%{title}%')
+            filters['title__like'] = f'%{title}%'
         if status is not None:
-            filters.update(status=status)
+            filters['status'] = status
 
         return await self.select_models_order(db, 'sort', **filters)
 

backend/app/admin/crud/crud_opera_log.py

@@ -23,11 +23,11 @@ async def get_list(self, username: str | None, status: int | None, ip: str | Non
         filters = {}
 
         if username is not None:
-            filters.update(username__like=f'%{username}%')
+            filters['username__like'] = f'%{username}%'
         if status is not None:
-            filters.update(status__eq=status)
+            filters['status__eq'] = status
         if ip is not None:
-            filters.update(ip__like=f'%{ip}%')
+            filters['ip__like'] = f'%{ip}%'
 
         return await self.select_order('created_time', 'desc', **filters)
 

backend/app/admin/crud/crud_role.py

@@ -59,9 +59,9 @@ async def get_list(self, name: str | None, status: int | None) -> Select:
         filters = {}
 
         if name is not None:
-            filters.update(name__like=f'%{name}%')
+            filters['name__like'] = f'%{name}%'
         if status is not None:
-            filters.update(status__eq=status)
+            filters['status'] = status
 
         return await self.select_order(
             'id', load_strategies={'users': 'noload', 'menus': 'noload', 'scopes': 'noload'}, **filters

backend/plugin/config/crud/crud_config.py

@@ -66,9 +66,9 @@ async def get_list(self, name: str | None, type: str | None) -> Select:
         filters = {'type__not_in': settings.CONFIG_BUILT_IN_TYPES}
 
         if name is not None:
-            filters.update(name__like=f'%{name}%')
+            filters['name__like'] = f'%{name}%'
         if type is not None:
-            filters.update(type__like=f'%{type}%')
+            filters['type__like'] = f'%{type}%'
 
         return await self.select_order('created_time', 'desc', **filters)