From 4c7963b070c42f2cb48f35c46e44d0947630ffc5 Mon Sep 17 00:00:00 2001
From: Andrea Adamczyk <andrea.adamczyk@processmaker.com>
Date: Tue, 27 Apr 2021 16:27:23 -0400
Subject: [PATCH] PMCORE-2957

---
 rbac/engine/classes/model/Roles.php              | 4 ++--
 workflow/engine/methods/tracker/tracker_Ajax.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rbac/engine/classes/model/Roles.php b/rbac/engine/classes/model/Roles.php
index 09ec91c80..4ec3e6a34 100644
--- a/rbac/engine/classes/model/Roles.php
+++ b/rbac/engine/classes/model/Roles.php
@@ -118,8 +118,8 @@ class Roles extends BaseRoles
             $criteria->add(RolesPeer::ROL_UID, '', Criteria::NOT_EQUAL);
             $criteria->add(RolesPeer::ROL_CODE, RBAC::PROCESSMAKER_GUEST, Criteria::NOT_EQUAL);
             $criteria->add(SystemsPeer::SYS_CODE, $systemCode);
-            $criteria->add(RolesPeer::ROL_CREATE_DATE, '', Criteria::NOT_EQUAL);
-            $criteria->add(RolesPeer::ROL_UPDATE_DATE, '', Criteria::NOT_EQUAL);
+            $criteria->add(RolesPeer::ROL_CREATE_DATE, '0000-00-00 00:00:00', Criteria::NOT_EQUAL);
+            $criteria->add(RolesPeer::ROL_UPDATE_DATE, '0000-00-00 00:00:00', Criteria::NOT_EQUAL);
 
             if (!empty($filter)) {
                 $criteria->add(RolesPeer::ROL_CODE, '%' . $filter . '%', Criteria::LIKE);
diff --git a/workflow/engine/methods/tracker/tracker_Ajax.php b/workflow/engine/methods/tracker/tracker_Ajax.php
index 10db86293..85cdb8908 100644
--- a/workflow/engine/methods/tracker/tracker_Ajax.php
+++ b/workflow/engine/methods/tracker/tracker_Ajax.php
@@ -264,7 +264,7 @@ try {
                     $oCriteria = new Criteria('workflow');
                     $oCriteria->add(AppDelegationPeer::APP_UID, $_SESSION['APPLICATION']);
                     $oCriteria->add(AppDelegationPeer::TAS_UID, $aTasks, Criteria::IN);
-                    $oCriteria->add($oCriteria->getNewCriterion(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL)->addOr($oCriteria->getNewCriterion(AppDelegationPeer::DEL_FINISH_DATE, '')));
+                    $oCriteria->add($oCriteria->getNewCriterion(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL)->addOr($oCriteria->getNewCriterion(AppDelegationPeer::DEL_FINISH_DATE, '0000-00-00 00:00:00')));
                     if (AppDelegationPeer::doCount($oCriteria) > 0) {
                         $oStage->color = '#FF0000';
                     } else {