From d45adc4c44faf0f7f53a8459fbdaa0d9ce838d91 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Tue, 23 Aug 2016 16:56:41 -0400 Subject: [PATCH] HOR-1664 --- workflow/engine/classes/model/AppDelegation.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php index f4ae3e270..d8d430167 100755 --- a/workflow/engine/classes/model/AppDelegation.php +++ b/workflow/engine/classes/model/AppDelegation.php @@ -139,6 +139,7 @@ class AppDelegation extends BaseAppDelegation $delIndex = 1; $delPreviusUsrUid = $sUsrUid; + $delPreviousFather = $sPrevious; if ($rs->next()) { $row = $rs->getRow(); @@ -172,8 +173,8 @@ class AppDelegation extends BaseAppDelegation } if($flagControlMulInstance){ $nextTaskUid = $sTasUid; - $index = $this->getAllTheardMultipleInstance($delPrevious, $sAppUid); - if($this->createThread($index, $sAppUid)){ + $index = $this->getAllTheardMultipleInstance($delPreviousFather, $sAppUid); + if($this->createThread($index, $sAppUid, $sUsrUid)){ return 0; } } @@ -869,14 +870,18 @@ class AppDelegation extends BaseAppDelegation * * @param array $index * @param string $sAppUid + * @param string $sUsrUid * @return boolean $res */ - public static function createThread($index, $sAppUid){ + public static function createThread($index, $sAppUid, $sUsrUid = ''){ $criteriaDel = new Criteria("workflow"); $criteriaDel->addSelectColumn(AppDelegationPeer::DEL_INDEX); $criteriaDel->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS); $criteriaDel->add(AppDelegationPeer::APP_UID, $sAppUid); $criteriaDel->add(AppDelegationPeer::DEL_PREVIOUS, $index, Criteria::IN); + if($sUsrUid !== ''){ + $criteriaDel->add(AppDelegationPeer::USR_UID, $sUsrUid); + } $criteriaDel = AppDelegationPeer::doSelectRS($criteriaDel); $criteriaDel->setFetchmode(ResultSet::FETCHMODE_ASSOC); $res = $criteriaDel->next();