认证-上报库-查看-自定义导出-bug57881-解决sheetName问题

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++;  // 单元格非空才++