From 56207f7f4822b33dc5ebcd4ff025cc7825e5fd44 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 13 Aug 2020 15:46:09 +0300 Subject: [PATCH] fix --- application/Espo/Modules/Crm/Repositories/Lead.php | 1 + application/Espo/ORM/Repository/RDBRepository.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/application/Espo/Modules/Crm/Repositories/Lead.php b/application/Espo/Modules/Crm/Repositories/Lead.php index 9d52c63da5..bdb521b8c9 100644 --- a/application/Espo/Modules/Crm/Repositories/Lead.php +++ b/application/Espo/Modules/Crm/Repositories/Lead.php @@ -55,6 +55,7 @@ class Lead extends \Espo\Core\Repositories\Database public function handleSelectParams(&$params) { parent::handleSelectParams($params); + if (array_key_exists('select', $params)) { if (in_array('name', $params['select'])) { $additionalAttributeList = ['emailAddress', 'phoneNumber', 'accountName']; diff --git a/application/Espo/ORM/Repository/RDBRepository.php b/application/Espo/ORM/Repository/RDBRepository.php index 2a04bdc57a..300e74ff1f 100644 --- a/application/Espo/ORM/Repository/RDBRepository.php +++ b/application/Espo/ORM/Repository/RDBRepository.php @@ -206,8 +206,8 @@ class RDBRepository extends Repository public function find(?array $params = []) : Collection { // @todo Remove. - if (empty($query['skipAdditionalSelectParams'])) { - $this->handleSelectParams($query); + if ($params && empty($params['skipAdditionalSelectParams'])) { + $this->handleSelectParams($params); } return $this->createSelectBuilder()->find($params); @@ -221,7 +221,7 @@ class RDBRepository extends Repository public function findOne(?array $params = []) : ?Entity { // @todo Remove. - if (empty($params['skipAdditionalSelectParams'])) { + if ($params && empty($params['skipAdditionalSelectParams'])) { $this->handleSelectParams($params); }