1

video-gen-api/app/services/team_manager_service.py

@@ -31,7 +31,7 @@ async def set_team_manager(db: AsyncSession, team_id: str, user_id: str | None)
 
     # 验证用户存在、是前台用户、属于该团队
     user_result = await db.execute(
-        select(User).where(User.id == user_id, User.deleted_at.is_(None)).limit(1)
+        select(User).where(User.id == user_id, User.is_active.is_(True)).limit(1)
     )
     user = user_result.scalar_one_or_none()
     if not user:
@@ -89,7 +89,7 @@ async def get_team_members(
         select(func.count(User.id)).where(
             User.user_type == UserType.FRONTEND.value,
             User.team_id == team_id,
-            User.deleted_at.is_(None),
+            User.is_active.is_(True),
         )
     )).scalar() or 0
 
@@ -98,7 +98,7 @@ async def get_team_members(
         select(User).where(
             User.user_type == UserType.FRONTEND.value,
             User.team_id == team_id,
-            User.deleted_at.is_(None),
+            User.is_active.is_(True),
         )
         .order_by(User.created_at.asc())
         .offset((page - 1) * page_size)
@@ -135,7 +135,7 @@ async def transfer_credits_to_member(
 
     # 获取管理人
     manager_result = await db.execute(
-        select(User).where(User.id == manager_id, User.deleted_at.is_(None)).limit(1)
+        select(User).where(User.id == manager_id, User.is_active.is_(True)).limit(1)
     )
     manager = manager_result.scalar_one_or_none()
     if not manager:
@@ -143,7 +143,7 @@ async def transfer_credits_to_member(
 
     # 获取目标成员
     member_result = await db.execute(
-        select(User).where(User.id == target_member_id, User.deleted_at.is_(None)).limit(1)
+        select(User).where(User.id == target_member_id, User.is_active.is_(True)).limit(1)
     )
     member = member_result.scalar_one_or_none()
     if not member: