Merge remote-tracking branch 'tango/MC-18696' into PR-08-233

Author: dhorytskyi

app/code/Magento/Rule/Model/ResourceModel/Rule/Collection/AbstractCollection.php

@@ -9,6 +9,7 @@
 /**
  * Abstract Rule entity resource collection model
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @since 100.0.2
  */
@@ -83,11 +84,21 @@ public function addWebsiteFilter($websiteId)
                 if ($website instanceof \Magento\Store\Model\Website) {
                     $websiteIds[$index] = $website->getId();
                 }
+                $websiteIds[$index] = (int) $websiteIds[$index];
             }
+
+            $websiteSelect = $this->getConnection()->select();
+            $websiteSelect->from(
+                $this->getTable($entityInfo['associations_table']),
+                [$entityInfo['rule_id_field']]
+            )->distinct(
+                true
+            )->where(
+                $this->getConnection()->quoteInto($entityInfo['entity_id_field'] . ' IN (?)', $websiteIds)
+            );
             $this->getSelect()->join(
-                ['website' => $this->getTable($entityInfo['associations_table'])],
-                $this->getConnection()->quoteInto('website.' . $entityInfo['entity_id_field'] . ' IN (?)', $websiteIds)
-                . ' AND main_table.' . $entityInfo['rule_id_field'] . ' = website.' . $entityInfo['rule_id_field'],
+                ['website' => $websiteSelect],
+                'main_table.' . $entityInfo['rule_id_field'] . ' = website.' . $entityInfo['rule_id_field'],
                 []
             );
         }
@@ -127,11 +138,11 @@ public function addIsActiveFilter($isActive = 1)
     }
 
     /**
-     * Retrieve correspondent entity information (associations table name, columns names)
-     * of rule's associated entity by specified entity type
+     * Retrieve correspondent entity information of rule's associated entity by specified entity type
      *
-     * @param string $entityType
+     * (associations table name, columns names)
      *
+     * @param string $entityType
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return array
      */