diff --git a/application/Espo/Modules/Crm/Services/Activities.php b/application/Espo/Modules/Crm/Services/Activities.php index 5f47052a9a..6d3b634d63 100644 --- a/application/Espo/Modules/Crm/Services/Activities.php +++ b/application/Espo/Modules/Crm/Services/Activities.php @@ -652,14 +652,21 @@ class Activities extends \Espo\Core\Services\Base $offset = $params['offset'] ?? 0; if (!$onlyScope && $scope === 'User') { + $skipUnion = false; foreach ($parts as &$part) { + if (strpos($part, 'UNION') !== false) { + $skipUnion = true; + break; + } $part .= " ORDER BY dateStart DESC"; if ($maxSize) { $part .= " LIMIT " . intval($offset + $maxSize + 1); } $part = '(' . $part . ')'; } - $sql = "SELECT * FROM (\n" . implode(" UNION ", $parts) . "\n) t"; + if (!$skipUnion) { + $sql = "SELECT * FROM (\n" . implode(" UNION ", $parts) . "\n) t"; + } } if ($scope === 'User') {