diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/SymbolicMapHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/SymbolicMapHandler.java index e93cfa0704..cc8706c8a4 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/SymbolicMapHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/SymbolicMapHandler.java @@ -47,8 +47,7 @@ public class SymbolicMapHandler extends GroupChartHandler { var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis); var extBubble = formatResult.getAxisMap().get(ChartAxis.extBubble); var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis); - Map result = ChartDataBuild.transSymbolicMapNormalWithDetail(xAxis, yAxis, extBubble, data, detailFields, detailData); - return result; + return ChartDataBuild.transSymbolicMapNormalWithDetail(view, xAxis, yAxis, extBubble, data, detailFields, detailData); } @Override diff --git a/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java b/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java index cd695276ee..99e95aaee5 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java +++ b/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java @@ -1766,7 +1766,7 @@ public class ChartDataBuild { } } - public static Map transSymbolicMapNormalWithDetail(List xAxis, List yAxis, List extBubble, List data, List detailFields, List detailData) { + public static Map transSymbolicMapNormalWithDetail(ChartViewDTO view, List xAxis, List yAxis, List extBubble, List data, List detailFields, List detailData) { int detailIndex = xAxis.size(); List realDetailFields = detailFields.subList(detailIndex, detailFields.size()); @@ -1778,7 +1778,7 @@ public class ChartDataBuild { fields.addAll(extBubble); if (ObjectUtils.isNotEmpty(yAxis)) fields.addAll(yAxis); - Map map = transTableNormal(fields, null, data, new HashMap<>()); + Map map = transTableNormal(fields, view, data, new HashMap<>()); List> tableRow = (List>) map.get("tableRow"); final int xEndIndex = detailIndex; Map> groupDataList = detailData.stream().collect(Collectors.groupingBy(item -> "(" + StringUtils.join(ArrayUtils.subarray(item, 0, xEndIndex), ")-de-(") + ")"));