MAGETWO-65667: Error Importing Customer multiselect attribute

Author: Eric Bohanon

app/code/Magento/CustomerImportExport/Model/Import/Address.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\CustomerImportExport\Model\Import;
 
+use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
 /**
@@ -740,7 +741,16 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                             continue;
                         }
                         if (isset($rowData[$attributeCode]) && strlen($rowData[$attributeCode])) {
-                            $this->isAttributeValid($attributeCode, $attributeParams, $rowData, $rowNumber);
+                            $multiSeparator = isset($this->_parameters[Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR]) ?
+                                $this->_parameters[Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR] :
+                                Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR;
+                            $this->isAttributeValid(
+                                $attributeCode,
+                                $attributeParams,
+                                $rowData,
+                                $rowNumber,
+                                $multiSeparator
+                            );
                         } elseif ($attributeParams['is_required'] && (!isset(
                             $this->_addresses[$customerId]
                         ) || !in_array(

app/code/Magento/ImportExport/Model/Import/AbstractEntity.php

@@ -74,8 +74,7 @@ abstract class AbstractEntity
         self::ERROR_CODE_COLUMNS_NUMBER => "Number of columns does not correspond to the number of rows in the header",
         self::ERROR_EXCEEDED_MAX_LENGTH => 'Attribute %s exceeded max length',
         self::ERROR_INVALID_ATTRIBUTE_TYPE => 'Value for \'%s\' attribute contains incorrect value',
-        self::ERROR_INVALID_ATTRIBUTE_OPTION =>
-            "Value for %s attribute contains incorrect value, see acceptable values on settings specified for Admin",
+        self::ERROR_INVALID_ATTRIBUTE_OPTION => "Value for %s attribute contains incorrect value, see acceptable values on settings specified for Admin",
     ];
 
     /**#@-*/
@@ -665,11 +664,17 @@ public function getMasterAttributeCode()
      * @param array $attributeParams Attribute params
      * @param array $rowData Row data
      * @param int $rowNumber
+     * @param string $multiSeparator
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function isAttributeValid($attributeCode, array $attributeParams, array $rowData, $rowNumber)
-    {
+    public function isAttributeValid(
+        $attributeCode,
+        array $attributeParams,
+        array $rowData,
+        $rowNumber,
+        $multiSeparator
+    ) {
         $message = '';
         switch ($attributeParams['type']) {
             case 'varchar':
@@ -684,7 +689,13 @@ public function isAttributeValid($attributeCode, array $attributeParams, array $
                 break;
             case 'select':
             case 'multiselect':
-                $valid = isset($attributeParams['options'][strtolower($rowData[$attributeCode])]);
+                $valid = true;
+                foreach (explode($multiSeparator, strtolower($rowData[$attributeCode])) as $value) {
+                    $valid = isset($attributeParams['options'][$value]);
+                    if (!$valid) {
+                        break;
+                    }
+                }
                 $message = self::ERROR_INVALID_ATTRIBUTE_OPTION;
                 break;
             case 'int':

app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php

@@ -227,7 +227,11 @@ public function getAttributeOptions(
                     foreach ($value as $innerOption) {
                         if (strlen($innerOption['value'])) {
                             // skip ' -- Please Select -- ' option
-                            $options[strtolower($innerOption[$index])] = $innerOption['value'];
+                            if ($attribute->isStatic()) {
+                                $options[strtolower($innerOption[$index])] = $innerOption['value'];
+                            } else {
+                                $options[$innerOption['value']] = $innerOption[$index];
+                            }
                         }
                     }
                 }