diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java index d4255aca2d..dd22dbd20e 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java @@ -159,6 +159,12 @@ public class ExportCenterDownLoadManage { private void setExportFromName(ExportTaskDTO exportTaskDTO) { if (exportTaskDTO.getExportFromType().equalsIgnoreCase("chart")) { exportTaskDTO.setExportFromName(coreChartViewRepository.findById(exportTaskDTO.getExportFrom()).orElse(new CoreChartView()).getTitle()); + if (StringUtils.isNotEmpty(exportTaskDTO.getExportFromName())) { + ChartExcelRequest request = JsonUtil.parseObject(exportTaskDTO.getParams(), ChartExcelRequest.class); + if (request.getViewInfo() != null && request.getViewInfo().getId() != null && request.getViewInfo().getId().equals(exportTaskDTO.getExportFrom())) { + exportTaskDTO.setExportFromName(request.getViewInfo().getTitle()); + } + } } if (exportTaskDTO.getExportFromType().equalsIgnoreCase("dataset")) { exportTaskDTO.setExportFromName(coreDatasetGroupRepository.findById(exportTaskDTO.getExportFrom()).orElse(new CoreDatasetGroup()).getName()); diff --git a/sdk/common/src/main/java/io/dataease/model/ExportTaskDTO.java b/sdk/common/src/main/java/io/dataease/model/ExportTaskDTO.java index e7cb1c9035..1c022236fe 100644 --- a/sdk/common/src/main/java/io/dataease/model/ExportTaskDTO.java +++ b/sdk/common/src/main/java/io/dataease/model/ExportTaskDTO.java @@ -34,4 +34,6 @@ public class ExportTaskDTO { private String exportFromName; private String orgName; + + private String params; }