diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/GroupBarHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/GroupBarHandler.java index 0f2735bc48..f4dc3f62b3 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/GroupBarHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/GroupBarHandler.java @@ -49,10 +49,10 @@ public class GroupBarHandler extends BarHandler { if (ObjectUtils.isNotEmpty(xAxisExt) && Objects.equals(drillFields.get(0).getId(), xAxisExt.get(0).getId())) { fieldsToFilter.addAll(view.getXAxis()); + groupStackDrill(noDrillFieldAxis, noDrillFilterList, fieldsToFilter, drillFields, drillRequestList); + formatResult.getAxisMap().put(ChartAxis.xAxis, noDrillFieldAxis); + result.setFilterList(noDrillFilterList); } - groupStackDrill(noDrillFieldAxis, noDrillFilterList, fieldsToFilter, drillFields, drillRequestList); - formatResult.getAxisMap().put(ChartAxis.xAxis, noDrillFieldAxis); - result.setFilterList(noDrillFilterList); } return (T) result; } diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackGroupBarHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackGroupBarHandler.java index 78e3fc04d7..e0234268ea 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackGroupBarHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackGroupBarHandler.java @@ -63,10 +63,10 @@ public class StackGroupBarHandler extends BarHandler { fieldsToFilter.addAll(view.getXAxis()); fieldsToFilter.addAll(xAxisExt); } + groupStackDrill(noDrillFieldAxis, noDrillFilterList, fieldsToFilter, drillFields, drillRequestList); + formatResult.getAxisMap().put(ChartAxis.xAxis, noDrillFieldAxis); + result.setFilterList(noDrillFilterList); } - groupStackDrill(noDrillFieldAxis, noDrillFilterList, fieldsToFilter, drillFields, drillRequestList); - formatResult.getAxisMap().put(ChartAxis.xAxis, noDrillFieldAxis); - result.setFilterList(noDrillFilterList); } return (T) result; }