Merge branch 'master' into optimize-by-cursor

# Conflicts:
#	backend/app/admin/crud/crud_dept.py

Author: wu-clan

backend/app/admin/crud/crud_dept.py

@@ -106,18 +106,17 @@ async def get_with_relation(self, db: AsyncSession, dept_id: int) -> Dept | None
         result = await db.execute(stmt)
         return result.scalars().first()
 
-    async def get_children(self, db: AsyncSession, dept_id: int) -> list[Dept | None]:
+    async def get_children(self, db: AsyncSession, dept_id: int) -> Sequence[Dept | None]:
         """
         获取子部门列表
 
         :param db: 数据库会话
         :param dept_id: 部门 ID
         :return:
         """
-        stmt = select(self.model).options(selectinload(self.model.children)).where(self.model.id == dept_id)
+        stmt = select(self.model).where(self.model.parent_id == dept_id, self.model.del_flag == 0)
         result = await db.execute(stmt)
-        dept = result.scalars().first()
-        return dept.children
+        return result.scalars().all()
 
 
 dept_dao: CRUDDept = CRUDDept(Dept)

backend/app/admin/crud/crud_opera_log.py

@@ -22,11 +22,11 @@ async def get_list(self, username: str | None = None, status: int | None = None,
         """
         filters = {}
         if username is not None:
-            filters.update(username=f'%{username}%')
+            filters.update(username__like=f'%{username}%')
         if status is not None:
             filters.update(status=status)
         if ip is not None:
-            filters.update(ip=f'%{ip}%')
+            filters.update(ip__like=f'%{ip}%')
         return await self.select_order('created_time', 'desc', **filters)
 
     async def create(self, db: AsyncSession, obj: CreateOperaLogParam) -> None:

docker-compose.yml

@@ -67,7 +67,7 @@ services:
     environment:
       - TZ=Asia/Shanghai
     volumes:
-      - fba_redis:/usr/local/etc/redis
+      - fba_redis:/data
     networks:
       - fba_network
 
@@ -138,6 +138,8 @@ services:
     restart: always
     depends_on:
       - fba_rabbitmq
+    volumes:
+      - ./deploy/backend/docker-compose/.env.server:/fba/backend/.env
     networks:
       - fba_network
     command: