MAGETWO-37726: Incorrect export result on medium profile

Author: Denys Rudchenko

app/code/Magento/CatalogImportExport/Model/Export/Product.php

@@ -682,9 +682,6 @@ protected function _getEntityCollection($resetCollection = false)
     {
         if ($resetCollection || empty($this->_entityCollection)) {
             $this->_entityCollection = $this->_entityCollectionFactory->create();
-            $this->_entityCollection->setOrder('has_options', 'asc');
-            $this->_entityCollection->setStoreId(Store::DEFAULT_STORE_ID);
-
         }
         return $this->_entityCollection;
     }
@@ -757,9 +754,12 @@ public function export()
         $page = 0;
         while (true) {
             ++$page;
-            $this->_prepareEntityCollection($this->_getEntityCollection(true));
+            $entityCollection = $this->_getEntityCollection(true);
+            $entityCollection->setOrder('has_options', 'asc');
+            $entityCollection->setStoreId(Store::DEFAULT_STORE_ID);
+            $this->_prepareEntityCollection($entityCollection);
             $this->paginateCollection($page, $this->getItemsPerPage());
-            if ($this->_getEntityCollection()->count() == 0) {
+            if ($entityCollection->count() == 0) {
                 break;
             }
             $exportData = $this->getExportData();
@@ -769,7 +769,7 @@ public function export()
             foreach ($exportData as $dataRow) {
                 $writer->writeRow($dataRow);
             }
-            if ($this->_getEntityCollection()->getCurPage() >= $this->_getEntityCollection()->getLastPageNumber()) {
+            if ($entityCollection->getCurPage() >= $entityCollection->getLastPageNumber()) {
                 break;
             }
         }