From 232eb450aa9c60851889b13b4a99ef24454e023e Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Fri, 29 Oct 2021 12:44:51 -0400 Subject: [PATCH] PMCORE-3490 Custom Case List is displaying other Processes cases than the one belong to the Report Table of a Process PMCORE_3.7.0-5474 --- .../src/ProcessMaker/BusinessModel/Cases/Home.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php index e9ea2cfd7..c70465f2f 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php @@ -278,6 +278,7 @@ class Home ->first(); if (!empty($caseList)) { $tableName = $caseList->ADD_TAB_NAME; + $proUid = $caseList->PRO_UID; //this gets the configured columns $columns = json_decode($caseList->CAL_COLUMNS); @@ -300,13 +301,18 @@ class Home } //this modifies the query - if (!empty($tableName) && !empty($fields)) { - $arguments[] = function ($query) use ($tableName, $fields, $customFilters, $types) { + if (!empty($tableName)) { + $arguments[] = function ($query) use ($tableName, $fields, $customFilters, $types, $proUid) { + //setting the related process + $query->where('PROCESS.PRO_UID', '=', $proUid); + + //setting columns data from report table $query->leftJoin($tableName, "{$tableName}.APP_UID", "=", "APP_DELEGATION.APP_UID"); foreach ($fields as $value) { $query->addSelect($value); } - //filters for custom case list + + //setting filters for custom case list foreach ($customFilters as $key => $filter) { if (in_array($key, $fields)) { //special case for date range