|
|
|
@ -174,7 +174,7 @@ public class ExcelUtil<T> |
|
|
|
|
for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) |
|
|
|
|
{ |
|
|
|
|
Cell cell = heard.getCell(i); |
|
|
|
|
if (StringUtils.isNotNull(cell != null)) |
|
|
|
|
if (StringUtils.isNotNull(cell)) |
|
|
|
|
{ |
|
|
|
|
String value = this.getCellValue(heard, i).toString(); |
|
|
|
|
cellMap.put(value, i); |
|
|
|
@ -827,7 +827,7 @@ public class ExcelUtil<T> |
|
|
|
|
try |
|
|
|
|
{ |
|
|
|
|
Cell cell = row.getCell(column); |
|
|
|
|
if (cell != null) |
|
|
|
|
if (StringUtils.isNotNull(cell)) |
|
|
|
|
{ |
|
|
|
|
if (cell.getCellTypeEnum() == CellType.NUMERIC || cell.getCellTypeEnum() == CellType.FORMULA) |
|
|
|
|
{ |
|
|
|
|