fix email address lookup

2019-10-16 15:39:23 +03:00
parent 7b241b90a0
commit 542d78425c
1 changed files with 8 additions and 1 deletions
@@ -67,8 +67,15 @@ class EmailAddress extends Record
        $selectManager = $this->getSelectManagerFactory()->create($entityType);
        $selectManager->applyAccess($selectParams);

+        $select = ['id', 'emailAddress', 'name'];
+
+        if ($this->getMetadata()->get(['entityDefs', $entityType, 'fields', 'name', 'type']) === 'personName') {
+            $select[] = 'firstName';
+            $select[] = 'lastName';
+        }
+
        $collection = $this->getEntityManager()->getRepository($entityType)
-            ->select(['id', 'emailAddress', 'name'])
+            ->select($select)
            ->find($selectParams);

        foreach ($collection as $entity) {