I added some validations by PM-1544
This commit is contained in:
@@ -176,14 +176,14 @@ class Derivation
|
||||
}
|
||||
|
||||
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
|
||||
$flagDefault = false;
|
||||
while ($rsCriteria->next()) {
|
||||
$arrayRouteData = G::array_merges($rsCriteria->getRow(), $arrayData);
|
||||
|
||||
if ((int)($arrayRouteData["ROU_DEFAULT"]) == 1) {
|
||||
$arrayNextTaskDefault = $arrayRouteData;
|
||||
$arrayNextTask = array();
|
||||
break;
|
||||
$flagDefault = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
$flagContinue = true;
|
||||
@@ -216,7 +216,9 @@ class Derivation
|
||||
$arrayNextTask[++$i] = $this->prepareInformationTask($arrayRouteData);
|
||||
}
|
||||
}
|
||||
|
||||
if($flagDefault && !$flagContinue){
|
||||
$arrayNextTask = array();
|
||||
}
|
||||
if (count($arrayNextTask) == 0 && count($arrayNextTaskDefault) > 0) {
|
||||
$arrayNextTask[++$i] = $this->prepareInformationTask($arrayNextTaskDefault);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user