|
@@ -1770,13 +1770,13 @@ class Database
|
|
|
if (isset($config['manage']['excel']) && $config['manage']['excel']) {
|
|
|
$method = 'excel';
|
|
|
$info = $this->info();
|
|
|
- //$data = $this->getAdminInfo($data);
|
|
|
$load = Dever::input('excel_load');
|
|
|
if ($load) {
|
|
|
return Dever::load($load, $data);
|
|
|
} elseif (is_string($config['manage']['excel']) && strstr($config['manage']['excel'], '.')) {
|
|
|
return Dever::load($config['manage']['excel'], $data);
|
|
|
} else {
|
|
|
+ $data = $this->getAdminInfo($data);
|
|
|
return $this->excel($info, $data, $config);
|
|
|
}
|
|
|
}
|
|
@@ -1810,7 +1810,6 @@ class Database
|
|
|
$v['name'] = $v['list_name'];
|
|
|
}
|
|
|
$header[$i] = $v['name'];
|
|
|
- $i++;
|
|
|
$j = 0;
|
|
|
foreach ($data as $ki => $vi) {
|
|
|
if (is_array($vi)) {
|
|
@@ -1845,6 +1844,7 @@ class Database
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ $i++;
|
|
|
}
|
|
|
}
|
|
|
|