fix for pg

espocrm · Apr 17, 2024 · d1373d5 · d1373d5
1 parent 8d683b0
commit d1373d5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/files/custom/Espo/Modules/RealEstate/Services/ActivitiesRealEstateProperty.php b/src/files/custom/Espo/Modules/RealEstate/Services/ActivitiesRealEstateProperty.php
@@ -73,7 +73,7 @@ public function getActivitiesMeetingQuery(Entity $entity, array $statusList): Se
                 'parentId',
                 'status',
                 'createdAt',
-                ['""', 'hasAttachment'],
+                ['false', 'hasAttachment'],
             ])
             ->where([
                 'OR' => [
@@ -122,16 +122,16 @@ public function getActivitiesCallQuery(Entity $entity, array $statusList): Selec
                 'name',
                 ['dateStart', 'dateStart'],
                 ['dateEnd', 'dateEnd'],
-                ['""', 'dateStartDate'],
-                ['""', 'dateEndDate'],
+                ['null', 'dateStartDate'],
+                ['null', 'dateEndDate'],
                 ['"Call"', '_scope'],
                 'assignedUserId',
                 'assignedUserName',
                 'parentType',
                 'parentId',
                 'status',
                 'createdAt',
-                ['""', 'hasAttachment'],
+                ['false', 'hasAttachment'],
             ])
             ->where([
                 'OR' => [
@@ -174,9 +174,9 @@ public function getActivitiesEmailQuery(Entity $entity, array $statusList): Sele
                 'id',
                 'name',
                 ['dateSent', 'dateStart'],
-                ['""', 'dateEnd'],
-                ['""', 'dateStartDate'],
-                ['""', 'dateEndDate'],
+                ['null', 'dateEnd'],
+                ['null', 'dateStartDate'],
+                ['null', 'dateEndDate'],
                 ['"Email"', '_scope'],
                 'assignedUserId',
                 'assignedUserName',

diff --git a/src/files/custom/Espo/Modules/RealEstate/Services/ActivitiesRealEstateRequest.php b/src/files/custom/Espo/Modules/RealEstate/Services/ActivitiesRealEstateRequest.php
@@ -73,7 +73,7 @@ public function getActivitiesMeetingQuery(Entity $entity, array $statusList): Se
                 'parentId',
                 'status',
                 'createdAt',
-                ['""', 'hasAttachment'],
+                ['false', 'hasAttachment'],
             ])
             ->where([
                 'OR' => [
@@ -117,16 +117,16 @@ public function getActivitiesCallQuery(Entity $entity, array $statusList): Selec
                 'name',
                 ['dateStart', 'dateStart'],
                 ['dateEnd', 'dateEnd'],
-                ['""', 'dateStartDate'],
-                ['""', 'dateEndDate'],
+                ['null', 'dateStartDate'],
+                ['null', 'dateEndDate'],
                 ['"Call"', '_scope'],
                 'assignedUserId',
                 'assignedUserName',
                 'parentType',
                 'parentId',
                 'status',
                 'createdAt',
-                ['""', 'hasAttachment'],
+                ['false', 'hasAttachment'],
             ])
             ->where([
                 'OR' => [
@@ -169,9 +169,9 @@ public function getActivitiesEmailQuery(Entity $entity, array $statusList): Sele
                 'id',
                 'name',
                 ['dateSent', 'dateStart'],
-                ['""', 'dateEnd'],
-                ['""', 'dateStartDate'],
-                ['""', 'dateEndDate'],
+                ['null', 'dateEnd'],
+                ['null', 'dateStartDate'],
+                ['null', 'dateEndDate'],
                 ['"Email"', '_scope'],
                 'assignedUserId',
                 'assignedUserName',