|
@@ -166,7 +166,7 @@ public class ExcelImportServer extends ImportBaseService {
|
|
|
while (rows.hasNext() && (row == null || sheet.getLastRowNum() - row.getRowNum() > params.getLastOfInvalidRow())) {
|
|
|
row = rows.next();
|
|
|
// 判断是集合元素还是不是集合元素,如果是就继续加入这个集合,不是就创建新的对象
|
|
|
- if ((row.getCell(params.getKeyIndex()) == null || StringUtils.isEmpty(getKeyValue(row.getCell(params.getKeyIndex())))) && object != null) {
|
|
|
+ if ((row.getCell(params.getKeyIndex()) == null || StringUtils.isNotEmpty(getKeyValue(row.getCell(params.getKeyIndex())))) && object != null) {
|
|
|
for (ExcelCollectionParams param : excelCollection) {
|
|
|
addListContinue(object, param, row, titlemap, targetId, pictures, params);
|
|
|
}
|