清理全局角色残留并修复项目权限判断

backend/app/services/etmf_service.py

@@ -10,6 +10,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.crud import document as document_crud
 from app.crud import etmf as etmf_crud
+from app.core.deps import get_operator_role_label
 from app.models.document import Document, DocumentStatus
 from app.models.etmf import EtmfNode
 from app.models.audit_log import AuditLog
@@ -17,12 +18,6 @@ from app.schemas.document import DocumentCreate, DocumentSummary
 from app.schemas.etmf import EtmfNodeCreate, EtmfNodeRead, EtmfNodeStatus, EtmfTreeNode, EtmfNodeUpdate
 
 
-def _role_value(user) -> str:
-    if user is None:
-        return "SYSTEM"
-    return user.role.value if hasattr(user.role, "value") else str(user.role)
-
-
 def calculate_node_status(node: EtmfNode, documents: Iterable[Document]) -> EtmfNodeStatus:
     docs = list(documents)
     if not node.is_active:
@@ -109,7 +104,7 @@ async def create_node(db: AsyncSession, payload: EtmfNodeCreate, current_user) -
             action="ETMF_NODE_CREATED",
             detail=f'{{"code":"{node.code}","name":"{node.name}"}}',
             operator_id=current_user.id,
-            operator_role=_role_value(current_user),
+            operator_role=await get_operator_role_label(db, payload.study_id, current_user),
         )
     )
     await db.commit()
@@ -138,7 +133,7 @@ async def update_node(db: AsyncSession, node_id: uuid.UUID, payload: EtmfNodeUpd
             action="ETMF_NODE_UPDATED",
             detail="{}",
             operator_id=current_user.id,
-            operator_role=_role_value(current_user),
+            operator_role=await get_operator_role_label(db, node.study_id, current_user),
         )
     )
     await db.commit()