From bbc742bad83d17f65a2dc309399e2d0776358438 Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Tue, 9 Aug 2016 15:13:50 -0400
Subject: [PATCH] HOR-1502

---
 workflow/engine/src/ProcessMaker/Core/RoutingScreen.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
index a8bd8fd31..3a8302f4f 100644
--- a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
+++ b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
@@ -20,9 +20,13 @@ class RoutingScreen extends \Derivation
             unset($aDataMerged[$key]['USER_ASSIGNED']);
             $aDataMerged[$key]['DEL_PRIORITY'] = '';
             foreach ($post as $i => $item) {
-                if(isset($post[$i]['SOURCE_UID']) && ($nextTask['NEXT_TASK']['TAS_UID'] === $post[$i]['SOURCE_UID']) && ($post[$i]['SOURCE_UID'] !== $post[$i]['TAS_UID'])){
+                if(isset($post[$i]['SOURCE_UID']) && ($nextTask['NEXT_TASK']['TAS_UID'] === $post[$i]['SOURCE_UID'])){
                     $flagJumpTask = true;
-                    $aDataMerged[$key]['NEXT_ROUTING'][] = $post[$i];
+                    if($post[$i]['SOURCE_UID'] === $post[$i]['TAS_UID']){
+                        $aDataMerged[$key]['USR_UID'] = $post[$i]['USR_UID'];
+                    } else {
+                        $aDataMerged[$key]['NEXT_ROUTING'][] = $post[$i];
+                    }
                 }
             }
         }