From 5bcea44ecb331c2ed706cbcb5df2652f584f8cb3 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Tue, 24 Sep 2019 10:18:58 +0300
Subject: [PATCH] fix user activities

---
 application/Espo/Modules/Crm/Services/Activities.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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') {