From 973e8cc77a6f1d8d57c7e55710a9ed35829b2358 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Mon, 20 Jun 2022 10:29:38 +0300
Subject: [PATCH] fix case email address order

---
 application/Espo/Modules/Crm/Services/CaseObj.php   | 13 +++++++++++++
 .../Espo/Modules/Crm/Services/Opportunity.php       | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/application/Espo/Modules/Crm/Services/CaseObj.php b/application/Espo/Modules/Crm/Services/CaseObj.php
index 61a262935d..6a980592e6 100644
--- a/application/Espo/Modules/Crm/Services/CaseObj.php
+++ b/application/Espo/Modules/Crm/Services/CaseObj.php
@@ -254,9 +254,22 @@ class CaseObj extends Record
                 'emailAddress' => $emailAddress,
                 'name' => $contact->get('name'),
                 'entityType' => 'Contact',
+                'entityId' => $contact->getId(),
             ];
         }
 
+        usort($dataList, function (stdClass $o1, stdClass $o2) use ($entity) {
+            if ($o1->entityId == $entity->get('contactId')) {
+                return -1;
+            }
+
+            if ($o2->entityId == $entity->get('contactId')) {
+                return +1;
+            }
+
+            return 0;
+        });
+
         return $dataList;
     }
 }
diff --git a/application/Espo/Modules/Crm/Services/Opportunity.php b/application/Espo/Modules/Crm/Services/Opportunity.php
index 67ef898e89..e55ada7236 100644
--- a/application/Espo/Modules/Crm/Services/Opportunity.php
+++ b/application/Espo/Modules/Crm/Services/Opportunity.php
@@ -701,9 +701,22 @@ class Opportunity extends Record
                 'emailAddress' => $emailAddress,
                 'name' => $contact->get('name'),
                 'entityType' => 'Contact',
+                'entityId' => $contact->getId(),
             ];
         }
 
+        usort($dataList, function (stdClass $o1, stdClass $o2) use ($entity) {
+            if ($o1->entityId == $entity->get('contactId')) {
+                return -1;
+            }
+
+            if ($o2->entityId == $entity->get('contactId')) {
+                return +1;
+            }
+
+            return 0;
+        });
+
         return $dataList;
     }
 }