From ca78226faa90b4676760b6fa4a190ed9ed7ebb43 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 15 Aug 2022 14:47:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5=E5=BA=93-?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B-=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC?= =?UTF-8?q?=E5=87=BA-bug57881-=E8=A7=A3=E5=86=B3sheetName=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/project/util/ExcelUtil.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java index efca534c0..2d95445af 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/ExcelUtil.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; @@ -120,7 +121,8 @@ public class ExcelUtil { int partNameNum = 0; for (int i = 0; i < workbook.getNumberOfSheets(); i++) {//获取每个Sheet表 sheet = workbook.getSheetAt(i); - WorksheetPart worksheetPart = (WorksheetPart) pkg.getParts().get(new PartName("/xl/worksheets/" + sheet.getSheetName().toLowerCase() + ".xml")); + String sheetName = "sheet" + (i+1); // xml下的表格名称 不是sheet页签名称 + WorksheetPart worksheetPart = (WorksheetPart) pkg.getParts().get(new PartName("/xl/worksheets/" + sheetName + ".xml")); partNameNum++; //获得数据的总行数 @@ -153,7 +155,7 @@ public class ExcelUtil { String key = (String) imgMap.get("key"); String text = (String) imgMap.get("text"); byte[] bytes = (byte[]) imgMap.get("bytes"); - if (("${" + key + "}").equals(cellValue)) { + if (StringUtils.isNotEmpty(cellValue) && cellValue.contains("${" + key + "}")) { // 根据图片大小调整行高 ByteArrayInputStream in = new ByteArrayInputStream(bytes); @@ -165,7 +167,7 @@ public class ExcelUtil { } // 插入图片到表格 - putImagePOI(worksheetPart, pkg, cell, bytes, sheet.getSheetName().toLowerCase(), String.valueOf(partNameNum)); + putImagePOI(worksheetPart, pkg, cell, bytes, sheetName, String.valueOf(partNameNum)); } } j++; // 单元格非空才++