From e073c82992be4dde447cd61e8dda58050ed4654e Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Tue, 5 Jan 2021 10:27:57 +0200
Subject: [PATCH] fix orm repository

---
 application/Espo/ORM/Repository/RDBRepository.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/Espo/ORM/Repository/RDBRepository.php b/application/Espo/ORM/Repository/RDBRepository.php
index 15aaf3abf7..31f4645eb2 100644
--- a/application/Espo/ORM/Repository/RDBRepository.php
+++ b/application/Espo/ORM/Repository/RDBRepository.php
@@ -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);
     }