diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java index 0a6b7bcb7d..b5768b8cf6 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java @@ -10,6 +10,7 @@ import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper; import io.dataease.chart.dao.ext.mapper.ExtChartViewMapper; import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField; import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper; +import io.dataease.dataset.manage.DatasetTableFieldManage; import io.dataease.dataset.manage.PermissionManage; import io.dataease.dataset.utils.TableUtils; import io.dataease.engine.constant.ExtFieldConstant; @@ -57,6 +58,9 @@ public class ChartViewManege { @Resource private ExtChartViewMapper extChartViewMapper; + @Resource + private DatasetTableFieldManage datasetTableFieldManage; + private ObjectMapper objectMapper = new ObjectMapper(); @Transactional @@ -111,7 +115,14 @@ public class ChartViewManege { public List listBySceneId(Long sceneId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("scene_id", sceneId); - return transChart(coreChartViewMapper.selectList(wrapper)); + List chartViewDTOS = transChart(coreChartViewMapper.selectList(wrapper)); + for (ChartViewDTO dto : chartViewDTOS) { + QueryWrapper wp = new QueryWrapper<>(); + wp.eq("dataset_group_id", dto.getTableId()); + List coreDatasetTableFields = coreDatasetTableFieldMapper.selectList(wp); + dto.setCalParams(Utils.getParams(datasetTableFieldManage.transDTO(coreDatasetTableFields))); + } + return chartViewDTOS; } public List transChart(List list) {