espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix orm repository

Browse Source
This commit is contained in:
Yuri Kuznetsov
2021-01-05 10:27:57 +02:00
parent aa82f96993
commit e073c82992
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/ORM/Repository/RDBRepository.php
+6 -6
View File
@@ -297,12 +297,6 @@ class RDBRepository extends Repository
$additionalColumnsConditions = $params['additionalColumnsConditions'] ?? [];
unset($params['additionalColumnsConditions']);
if ($type === Entity::MANY_MANY && count($additionalColumnsConditions)) {
$select = $this->applyRelationAdditionalColumnsConditions(
$entity, $relationName, $additionalColumnsConditions, $select
);
}
$select = null;
if ($entityType) {
@@ -310,6 +304,12 @@ class RDBRepository extends Repository
$select = Select::fromRaw($params);
}
if ($type === Entity::MANY_MANY && count($additionalColumnsConditions)) {
$select = $this->applyRelationAdditionalColumnsConditions(
$entity, $relationName, $additionalColumnsConditions, $select
);
}
return (int) $this->getMapper()->countRelated($entity, $relationName, $select);
}