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