From bf6ede64bd47374c0ae3d10e701e4d223dece819 Mon Sep 17 00:00:00 2001
From: mengyonghao <1533512157@qq.com>
Date: Mon, 5 Jan 2026 10:51:57 +0800
Subject: [PATCH] feat(workflow): add support for passing workspace ID

---
 api/app/controllers/app_controller.py |  5 +++--
 api/app/services/workflow_service.py  | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/api/app/controllers/app_controller.py b/api/app/controllers/app_controller.py
index 8374680b..a0df7d67 100644
--- a/api/app/controllers/app_controller.py
+++ b/api/app/controllers/app_controller.py
@@ -597,7 +597,8 @@ async def draft_run(
                 async for event in workflow_service.run_stream(
                         app_id=app_id,
                         payload=payload,
-                        config=config
+                        config=config,
+                        workspace_id=current_user.current_workspace_id
                 ):
                     # 提取事件类型和数据
                     event_type = event.get("event", "message")
@@ -627,7 +628,7 @@ async def draft_run(
             }
         )
 
-        result = await workflow_service.run(app_id, payload,config)
+        result = await workflow_service.run(app_id, payload, config, current_user.current_workspace_id)
 
         logger.debug(
             "工作流试运行返回结果",
diff --git a/api/app/services/workflow_service.py b/api/app/services/workflow_service.py
index 058767d9..917a40f9 100644
--- a/api/app/services/workflow_service.py
+++ b/api/app/services/workflow_service.py
@@ -410,7 +410,8 @@ class WorkflowService:
             self,
             app_id: uuid.UUID,
             payload: DraftRunRequest,
-            config: WorkflowConfig
+            config: WorkflowConfig,
+            workspace_id: uuid.UUID,
     ):
         """运行工作流
 
@@ -484,7 +485,7 @@ class WorkflowService:
                 workflow_config=workflow_config_dict,
                 input_data=input_data,
                 execution_id=execution.execution_id,
-                workspace_id="",
+                workspace_id=str(workspace_id),
                 user_id=payload.user_id
             )
 
@@ -530,7 +531,8 @@ class WorkflowService:
             self,
             app_id: uuid.UUID,
             payload: DraftRunRequest,
-            config: WorkflowConfig
+            config: WorkflowConfig,
+            workspace_id: uuid.UUID,
     ):
         """运行工作流（流式）
 
@@ -603,7 +605,7 @@ class WorkflowService:
                     workflow_config=workflow_config_dict,
                     input_data=input_data,
                     execution_id=execution.execution_id,
-                    workspace_id="",
+                    workspace_id=str(workspace_id),
                     user_id=payload.user_id
             ):
                 # 直接转发 executor 的事件（已经是正确的格式）