Przeglądaj źródła

isNone 改回 not

4.1.3.A
jueyue 9 lat temu
rodzic
commit
1d45e68984
2 zmienionych plików z 4 dodań i 4 usunięć
  1. +3
    -3
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java
  2. +1
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java

+ 3
- 3
easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java Wyświetl plik

@@ -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<ExcelExportEntity> 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<ExcelExportEntity> 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;
}
}


+ 1
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java Wyświetl plik

@@ -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 {


Ładowanie…
Anuluj
Zapisz