From 873f05aca7cfa0d2c28cc742aa96cdd6809b3a22 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 11 Mar 2025 18:06:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=BF=9C=E7=A8=8Bexce?= =?UTF-8?q?l=E6=9B=B4=E6=96=B0=E5=A4=B1=E8=B4=A5=20(#15286)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: taojinlong --- .../java/io/dataease/datasource/provider/ExcelUtils.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java index 563590534b..229d66f2e2 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java @@ -271,7 +271,7 @@ public class ExcelUtils { String filename = file.getOriginalFilename(); List excelSheetDataList = null; try { - excelSheetDataList = parseExcel(filename, file.getInputStream(), true); + excelSheetDataList = parseExcel(filename, file.getInputStream(), true, filename); } catch (Exception e) { DEException.throwException(e); } @@ -356,7 +356,7 @@ public class ExcelUtils { FileInputStream fileInputStream = new FileInputStream(path + fileNames.get("tranName")); List returnSheetDataList = new ArrayList<>(); try { - returnSheetDataList = parseExcel(fileNames.get("tranName"), fileInputStream, true).stream().filter(excelSheetData -> !CollectionUtils.isEmpty(excelSheetData.getFields())).collect(Collectors.toList()); + returnSheetDataList = parseExcel(fileNames.get("tranName"), fileInputStream, true, fileNames.get("fileName")).stream().filter(excelSheetData -> !CollectionUtils.isEmpty(excelSheetData.getFields())).collect(Collectors.toList()); } catch (Exception e) { DEException.throwException(e); } @@ -605,7 +605,7 @@ public class ExcelUtils { } - private List parseExcel(String filename, InputStream inputStream, boolean isPreview) throws IOException { + private List parseExcel(String filename, InputStream inputStream, boolean isPreview, String originFilename) throws IOException { List excelSheetDataList = new ArrayList<>(); String suffix = filename.substring(filename.lastIndexOf(".") + 1); if (StringUtils.equalsIgnoreCase(suffix, "xlsx") || StringUtils.equalsIgnoreCase(suffix, "xls")) { @@ -701,7 +701,7 @@ public class ExcelUtils { excelSheetData.setFields(fields); excelSheetData.setData(data); excelSheetData.setFileName(filename); - excelSheetData.setExcelLabel(filename.substring(0, filename.lastIndexOf('.'))); + excelSheetData.setExcelLabel(originFilename.substring(0, originFilename.lastIndexOf('.'))); excelSheetDataList.add(excelSheetData); } inputStream.close();