MAGETWO-69024: Selects correct stores value option #9549

magento · May 16, 2017 · 3a9c9ed · 3a9c9ed
2 parents 6dfe212 + 9ed8428
commit 3a9c9ed
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
@@ -137,7 +137,13 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
                             ['t.option_id', 't.value']
                         )->where(
                             $this->_connection->quoteInto('t.option_id IN (?)', $valueIds)
-                        );
+                        )->where(
+                            $this->_connection->quoteInto('t.store_id IN(?)', [
+                                \Magento\Store\Model\Store::DEFAULT_STORE_ID,
+                                $storeId
+                            ])
+                        )
+                        ->order('t.store_id ASC');
                         $cursor = $this->_connection->query($select);
                         while ($row = $cursor->fetch(\Zend_Db::FETCH_ASSOC)) {
                             $valueColumnName = $valueColumns[$row['option_id']];