Fixed Conditional on merge.

Meaningful-Data · Jan 16, 2025 · 65c46f4 · 65c46f4
1 parent b11b600
commit 65c46f4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/vtlengine/Operators/Conditional.py b/src/vtlengine/Operators/Conditional.py
@@ -323,10 +323,10 @@ def evaluate(
 
             for i, condition in enumerate(conditions):
                 value = thenOps[i].value if isinstance(thenOps[i], Scalar) else thenOps[i].data
-                result.data = np.where(
-                    condition.data,
-                    value,
-                    result.data,  # type: ignore[call-overload]
+                result.data = np.where(  # type: ignore[call-overload]
+                    condition.data.notna(),
+                    np.where(condition.data, value, result.data),  # type: ignore[call-overload]
+                    result.data,
                 )
 
             condition_mask_else = ~np.any([condition.data for condition in conditions], axis=0)