fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolving new conflict with PMCORE-543

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2020-04-13 14:04:37 +00:00
parent 4255031a49 349f4be85a
commit 33879b05ed
80 changed files with 3856 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/src/ProcessMaker/Model/Delegation.php
View File

@@ -499,7 +499,7 @@ class Delegation extends Model
Delegation::$groups = $groups;
// Start the first query
$query1 = Delegation::query()->select('APP_NUMBER');
$query1 = Delegation::query()->select(['APP_NUMBER', 'DEL_INDEX']);
// Add the join clause
$query1->join('TASK', function ($join) {
@@ -539,9 +539,10 @@ class Delegation extends Model
$selfServiceTasks = TaskUser::getSelfServicePerUser($usrUid);
if (!empty($selfServiceTasks)) {
// Start the first query
$query2 = Delegation::query()->select('APP_NUMBER');
// Start the second query
$query2 = Delegation::query()->select(['APP_NUMBER', 'DEL_INDEX']);
$query2->tasksIn($selfServiceTasks);
$query2->isThreadOpen();
$query2->noUserInThread();
// Build the complex query that uses "UNION DISTINCT" clause