Merged in bugfix/PMCORE-3686 (pull request #8397)

PMCORE-3686

Approved-by: Julio Cesar Laura Avendaño

composer.json

@@ -35,10 +35,10 @@
         "laravel/framework": "5.7.*",
         "luracast/restler": "3.0",
         "bshaffer/oauth2-server-php": "v1.0",
-        "colosa/pmui": "release/3.7.3-dev",
-        "colosa/michelangelofe": "release/3.7.3-dev",
-        "colosa/pmdynaform": "release/3.7.3-dev",
-        "colosa/taskscheduler": "release/1.0.2-dev",
+        "colosa/pmui": "release/3.7.4-dev",
+        "colosa/michelangelofe": "release/3.7.4-dev",
+        "colosa/pmdynaform": "release/3.7.4-dev",
+        "colosa/taskscheduler": "release/1.0.3-dev",
         "google/apiclient": "1.1.6",
         "dapphp/securimage": "^3.6",
         "psr/log": "1.0.0",

workflow/engine/src/ProcessMaker/BusinessModel/Cases/Search.php

@@ -102,8 +102,10 @@ class Search extends AbstractCases
         }
         // Filter by task
         if ($this->getTaskId()) {
-            // Join with delegation
-            $query->joinDelegation();
+            if (!$this->getUserId()) {
+                // Join with delegation if was not defined before
+                $query->joinDelegation();
+            }
             // Add the filter
             $query->task($this->getTaskId());
             // Get only the open threads related to the task