diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java index 6af31b0..989f9eb 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java @@ -162,21 +162,19 @@ public abstract class ExcelExportBase extends ExportBase { row.getRowNum() + 1); } - if (StringUtils.isEmpty(imagePath)) { - return; - } + byte[] value = null; if (entity.getExportImageType() == 1) { - byte[] value = ImageCache.getImage(imagePath); - patriarch.createPicture(anchor, - row.getSheet().getWorkbook().addPicture(value, getImageType(value))); + if (StringUtils.isNotEmpty(imagePath)) { + value = ImageCache.getImage(imagePath); + } } else { - byte[] value = (byte[]) (entity.getMethods() != null + value = (byte[]) (entity.getMethods() != null ? getFieldBySomeMethod(entity.getMethods(), obj) : entity.getMethod().invoke(obj, new Object[] {})); - if (value != null) { - patriarch.createPicture(anchor, - row.getSheet().getWorkbook().addPicture(value, getImageType(value))); - } + } + if (value != null) { + patriarch.createPicture(anchor, + row.getSheet().getWorkbook().addPicture(value, getImageType(value))); } } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/export/PdfExportServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/export/PdfExportServer.java index 3b95e3f..c644346 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/export/PdfExportServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/export/PdfExportServer.java @@ -108,6 +108,7 @@ public class PdfExportServer extends ExportBase { for (int k = 0, paramSize = excelParams.size(); k < paramSize; k++) { if (excelParams.get(k).getList() != null) { isListData = true; + break; } } //设置各个列的宽度 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java index 7a12652..3bf8470 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java @@ -117,7 +117,7 @@ public final class PoiElUtil { * @throws Exception */ private static Boolean isTrue(String[] keys, Map map) throws Exception { - if (keys.length == 0) { + if (keys.length == 1) { String constant = null; if ((constant = isConstant(keys[0])) != null) { return Boolean.valueOf(constant);