|
@@ -251,9 +251,9 @@ class Lists extends Backend
|
|
|
//列字段
|
|
//列字段
|
|
|
for ($currentColumn = 2; $currentColumn <= 5; $currentColumn++) {
|
|
for ($currentColumn = 2; $currentColumn <= 5; $currentColumn++) {
|
|
|
$val = $currentSheet->getCellByColumnAndRow($currentColumn, $currentRow)->getValue();
|
|
$val = $currentSheet->getCellByColumnAndRow($currentColumn, $currentRow)->getValue();
|
|
|
- if(is_null($val)) continue;
|
|
|
|
|
- $values[] = $val;
|
|
|
|
|
|
|
+ $values[] = is_null($val) ? '' : $val;
|
|
|
}
|
|
}
|
|
|
|
|
+ if(empty($values)) continue;
|
|
|
$field = implode('-', $values);
|
|
$field = implode('-', $values);
|
|
|
$row = $importregion::where('name', $field)->find();
|
|
$row = $importregion::where('name', $field)->find();
|
|
|
if(!empty($row)){
|
|
if(!empty($row)){
|