|
@@ -314,17 +314,19 @@ public class FilesValueCheckUtils {
|
|
|
|
|
|
|
|
|
|
|
|
- if (cellData.getCellType().equals(CellType.FORMULA)) {
|
|
|
- if (cellData.getCellFormula().equals(ReportFinalParam.EXECUTE_REPORT)) {
|
|
|
- model.setExcelFormula(cellData.getCellFormula());
|
|
|
-
|
|
|
- modelFillInList.add(model);
|
|
|
- } else {
|
|
|
-
|
|
|
- model.setExcelFormula(cellData.getCellFormula());
|
|
|
- modelCalcList.add(model);
|
|
|
- }
|
|
|
+ if (null != cellData) {
|
|
|
+ if (cellData.getCellType().equals(CellType.FORMULA)) {
|
|
|
+ if (cellData.getCellFormula().equals(ReportFinalParam.EXECUTE_REPORT)) {
|
|
|
+ model.setExcelFormula(cellData.getCellFormula());
|
|
|
+
|
|
|
+ modelFillInList.add(model);
|
|
|
+ } else {
|
|
|
+
|
|
|
+ model.setExcelFormula(cellData.getCellFormula());
|
|
|
+ modelCalcList.add(model);
|
|
|
+ }
|
|
|
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|