diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index b050c21d7..ed26dfa38 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -445,18 +445,16 @@ class Derivation * @param string $USR_UID * @return string $aRow['USR_REPORTS_TO'] */ - function getDenpendentUser ($USR_UID) - { - //require_once 'classes/model/Users.php'; - //here the uid to next Users + function getDenpendentUser($USR_UID) { + //Here the uid to next user $oC = new Criteria(); - $oC->addSelectColumn( UsersPeer::USR_REPORTS_TO ); - $oC->add( UsersPeer::USR_UID, $USR_UID ); - $oDataset = UsersPeer::doSelectRS( $oC ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $oC->addSelectColumn(UsersPeer::USR_REPORTS_TO); + $oC->add(UsersPeer::USR_UID, $USR_UID); + $oDataset = UsersPeer::doSelectRS($oC); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); $aRow = $oDataset->getRow(); - return $aRow['USR_REPORTS_TO']; + return $aRow['USR_REPORTS_TO'] != '' ? $aRow['USR_REPORTS_TO'] : $USR_UID; } /* setTasLastAssigned