From 2450fe3afea44aca3d78d8334edb0b50a4fdf4b6 Mon Sep 17 00:00:00 2001
From: Timebomb2018 <18868801967@163.com>
Date: Mon, 13 Apr 2026 19:00:36 +0800
Subject: [PATCH] refactor(workflow): move _merge_conv_vars call inside
 iteration loop for consistent state updates

---
 api/app/core/workflow/nodes/cycle_graph/iteration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/app/core/workflow/nodes/cycle_graph/iteration.py b/api/app/core/workflow/nodes/cycle_graph/iteration.py
index 7652e21f..1633b9c7 100644
--- a/api/app/core/workflow/nodes/cycle_graph/iteration.py
+++ b/api/app/core/workflow/nodes/cycle_graph/iteration.py
@@ -249,9 +249,9 @@ class IterationRuntime:
                     else:
                         self.result.append(output)
                     child_state.append(result)
+                    self._merge_conv_vars(child_pool)
                     if stopped:
                         self.looping = False
-                self._merge_conv_vars(batch_sorted[-1][3])
         else:
             # Execute iterations sequentially
             while idx < len(array_obj) and self.looping: