From 1d45e68984e3957b7e1eaf4202b963264a743507 Mon Sep 17 00:00:00 2001 From: jueyue Date: Tue, 5 May 2015 17:18:09 +0800 Subject: [PATCH] =?UTF-8?q?isNone=20=E6=94=B9=E5=9B=9E=20not?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecgframework/poi/excel/export/ExcelExportServer.java | 6 +++--- .../excel/export/template/ExcelExportOfTemplateUtil.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java index 5f6bed4..837a114 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java @@ -273,12 +273,12 @@ public class ExcelExportServer extends ExcelExportBase { CellStyle titleStyle = getExcelExportStyler().getTitleStyle(title.getColor()); for (int i = 0, exportFieldTitleSize = excelParams.size(); i < exportFieldTitleSize; i++) { ExcelExportEntity entity = excelParams.get(i); - if (StringUtils.isNoneBlank(entity.getName())) { + if (StringUtils.isNotBlank(entity.getName())) { createStringCell(row, cellIndex, entity.getName(), titleStyle, entity); } if (entity.getList() != null) { List sTitel = entity.getList(); - if (StringUtils.isNoneBlank(entity.getName())) { + if (StringUtils.isNotBlank(entity.getName())) { sheet.addMergedRegion(new CellRangeAddress(index, index, cellIndex, cellIndex + sTitel .size() @@ -309,7 +309,7 @@ public class ExcelExportServer extends ExcelExportBase { private int getRowNums(List excelParams) { for (int i = 0; i < excelParams.size(); i++) { if (excelParams.get(i).getList() != null - && StringUtils.isNoneBlank(excelParams.get(i).getName())) { + && StringUtils.isNotBlank(excelParams.get(i).getName())) { return 2; } } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java index 874acfb..6dc0c1e 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java @@ -405,7 +405,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { } map.put(teplateParams.getTempParams(), t); String val = eval(tempStr, map).toString(); - if (isNumber && StringUtils.isNoneEmpty(val)) { + if (isNumber && StringUtils.isNotEmpty(val)) { row.getCell(i + columnIndex).setCellValue(Double.parseDouble(val)); row.getCell(i + columnIndex).setCellType(Cell.CELL_TYPE_NUMERIC); } else {