Merge remote-tracking branch 'github-magento2ce/MC-5906' into EPAM-PR-41

Author: nikshostko

app/code/Magento/Rule/Model/Condition/Sql/Builder.php

@@ -252,23 +252,23 @@ public function attachConditionToCollection(
         if (!empty($whereExpression)) {
             if (!empty($combine->getConditions())) {
                 $conditions = '';
-                $attribute = '';
+                $attributeField = '';
                 foreach ($combine->getConditions() as $condition) {
                     if ($condition->getData('attribute') === \Magento\Catalog\Api\Data\ProductInterface::SKU) {
                         $conditions = $condition->getData('value');
-                        $attribute = $condition->getData('attribute');
+                        $attributeField = $condition->getMappedSqlField();
                     }
                 }
 
                 $collection->getSelect()->where($whereExpression);
 
-                if (!empty($conditions) && !empty($attribute)) {
+                if (!empty($conditions) && !empty($attributeField)) {
                     $conditions = explode(',', $conditions);
                     foreach ($conditions as &$condition) {
                         $condition = "'" . trim($condition) . "'";
                     }
                     $conditions = implode(', ', $conditions);
-                    $collection->getSelect()->order("FIELD($attribute, $conditions)");
+                    $collection->getSelect()->order("FIELD($attributeField, $conditions)");
                 }
             } else {
                 // Select ::where method adds braces even on empty expression