1

app/api/v1/oem_users.py

@@ -1,13 +1,13 @@
-"""管理员用户 CRUD。"""
+"""OEM 用户 CRUD。"""
 
 from fastapi import APIRouter, Query
 
 from app.dependencies import OemUser, DbSession
 from app.schemas.admin_user import AdminUserCreate, AdminUserOut, AdminUserUpdate
 from app.schemas.common import ApiResponse, PaginatedData
-from app.services import admin_user as oem_user_service
+from app.services import oem_user as oem_user_service
 
-router = APIRouter(prefix="/oem/users", tags=["管理-用户"])
+router = APIRouter(prefix="/oem/users", tags=["OEM-用户"])
 
 
 @router.get("", response_model=ApiResponse[PaginatedData[AdminUserOut]])
@@ -25,13 +25,12 @@ async def list_users(
     agent_id: int | None = Query(None, description="按所属代理用户 ID 筛选"),
     role_id: int | None = Query(None, ge=0, le=3, description="按角色筛选"),
 ) -> ApiResponse[PaginatedData[AdminUserOut]]:
-    oem_id=_oem.id
     users, total = await oem_user_service.list_users(
         db,
         page=page,
         page_size=page_size,
         username=username,
-        oem_id=oem_id,
+        oem_id=_oem.id,
         agent_id=agent_id,
         role_id=role_id,
     )
@@ -54,7 +53,7 @@ async def create_user(
     db: DbSession,
 ) -> ApiResponse[AdminUserOut]:
     try:
-        user = await oem_user_service.create_user(db, body,oem)
+        user = await oem_user_service.create_user(db, body, oem)
     except oem_user_service.AdminUserError as exc:
         return ApiResponse(ok=False, message=exc.message)
 
@@ -75,6 +74,7 @@ async def update_user(
     try:
         user = await oem_user_service.update_user(
             db,
+            oem,
             user_id,
             body,
             actor_id=oem.id,
@@ -96,7 +96,7 @@ async def delete_user(
     db: DbSession,
 ) -> ApiResponse[None]:
     try:
-        await oem_user_service.delete_user(db, user_id, actor_id=admin.id)
+        await oem_user_service.delete_user(db, oem, user_id, actor_id=oem.id)
     except oem_user_service.AdminUserError as exc:
         return ApiResponse(ok=False, message=exc.message)