From 585d737d43de13fcd536169a8a2c7d636850dc2c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 28 Sep 2022 12:04:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E5=A4=9Asheet?= =?UTF-8?q?=E9=A1=B5=E7=9A=84Excel=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E6=9C=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BB=8D=E7=84=B6=E4=BC=9A=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/DataSetTableService.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index f1be09918c..1486fc545f 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -204,6 +204,19 @@ public class DataSetTableService { excelSheetData.setData(null); excelSheetData.setJsonArray(null); }); + } + for (String s : map.keySet()) { + DataSetTableRequest sheetTable = new DataSetTableRequest(); + BeanUtils.copyBean(sheetTable, datasetTable); + sheetTable.setId(UUID.randomUUID().toString()); + sheetTable.setCreateBy(AuthUtils.getUser().getUsername()); + sheetTable.setCreateTime(System.currentTimeMillis()); + List excelSheetDataList = map.get(s); + sheetTable.setName(excelSheetDataList.get(0).getDatasetName()); + excelSheetDataList.forEach(excelSheetData -> { + excelSheetData.setData(null); + excelSheetData.setJsonArray(null); + }); DataTableInfoDTO info = new DataTableInfoDTO(); info.setExcelSheetDataList(excelSheetDataList); sheetTable.setInfo(new Gson().toJson(info)); @@ -225,6 +238,9 @@ public class DataSetTableService { if (checkIsRepeat(fieldArray)) { DataEaseException.throwException(Translator.get("i18n_excel_field_repeat")); } + } + + for (ExcelSheetData sheet : datasetTable.getSheets()) { DataSetTableRequest sheetTable = new DataSetTableRequest(); BeanUtils.copyBean(sheetTable, datasetTable); sheetTable.setId(UUID.randomUUID().toString());