Merge pull request #12 from viest/master

fix:result error resourceToArray method
motecshine · Nov 13, 2017 · 22b6813 · 22b6813
2 parents 46cf8e6 + 12250fd
commit 22b6813
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Writer/ExcelWriter.php b/src/Writer/ExcelWriter.php
@@ -67,12 +67,14 @@ public function resourceToArray()
             try {
                 $reader = IOFactory::load($this->data);
                 $worksheet = $reader->getActiveSheet()->toArray();
-                array_shift($worksheet);
+                $tableHeader = array_shift($worksheet);
                 $retval = [];
                 if (isset($this->config['table_header'])) {
                     foreach ($worksheet as $dataKey => $data) {
                         foreach ($data as $itemKey => $item) {
-                            $retval[$dataKey][$this->config['table_header'][$itemKey]] = $item;
+                            if(in_array($tableHeader[$itemKey], $this->config['table_header'])) {
+                                $retval[$dataKey][$tableHeader[$itemKey]] = $item;
+                            }
                         }
                     }
                 } else {