diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 78d6e8233..e5a8013ae 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -1239,7 +1239,7 @@ class processMap $result = $groups->getAllGroup($start, $limit, $filter); $c = 0; foreach ($result['rows'] as $results) { - if (!in_array($results['GRP_UID'], $aUIDS1)) { + if ($results["GRP_STATUS"] == "ACTIVE" && !in_array($results["GRP_UID"], $aUIDS1)) { $c++; $oCriteria = new Criteria('workflow'); $oCriteria->addSelectColumn('COUNT(*) AS MEMBERS_NUMBER'); diff --git a/workflow/engine/classes/model/Groupwf.php b/workflow/engine/classes/model/Groupwf.php index 39675b78a..3d25fee22 100755 --- a/workflow/engine/classes/model/Groupwf.php +++ b/workflow/engine/classes/model/Groupwf.php @@ -347,7 +347,6 @@ class Groupwf extends BaseGroupwf $criteria->addSelectColumn( GroupwfPeer::GRP_STATUS ); $criteria->addSelectColumn( GroupwfPeer::GRP_UX ); $criteria->addAsColumn( 'GRP_TITLE', ContentPeer::CON_VALUE ); - $criteria->addSelectColumn( ContentPeer::CON_VALUE, 'COCHALO' ); $criteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN ); $criteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); $criteria->add( ContentPeer::CON_LANG, SYS_LANG ); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php index c6cac2c64..71e66a64e 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php @@ -900,6 +900,7 @@ class Task $criteria->addSelectColumn( \GroupwfPeer::GRP_UX ); $criteria->addAsColumn( 'GRP_TITLE', \ContentPeer::CON_VALUE ); $criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN ); + $criteria->add(\GroupwfPeer::GRP_STATUS, "ACTIVE", \Criteria::EQUAL); $criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); $criteria->add( \ContentPeer::CON_LANG, SYS_LANG ); $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE );