From 97c12483ff7344e43de8d877c2f1582dd2cc35c3 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 7 Apr 2025 16:07:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=BB=84=E5=90=88=E5=9B=BE=E5=8F=B3=E8=BD=B4=E5=90=8C=E7=8E=AF?=
 =?UTF-8?q?=E6=AF=94=E5=AF=BC=E8=87=B4=E4=B8=8B=E9=92=BB=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/chart/charts/impl/mix/MixHandler.java | 7 ++++++-
 .../dataease/extensions/view/dto/CustomFilterResult.java   | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java
index 484699306f..c13dc93703 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java
@@ -57,7 +57,7 @@ public class MixHandler extends YoyChartHandler {
         boolean isDrill = filterResult
                 .getFilterList()
                 .stream()
-                .anyMatch(ele -> ele.getFilterType() == 1);
+                .anyMatch(ele -> ele.getFilterType() == 1) || filterResult.isDrill();
         if (StringUtils.equals((String) formatResult.getContext().get("isRight"), "isRight")) {
             var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis);
             var xAxisExt = formatResult.getAxisMap().get(ChartAxis.xAxisExt);
@@ -157,7 +157,12 @@ public class MixHandler extends YoyChartHandler {
         customFilter(view, originFilter.getFilterList(), formatResult2);
         var allFields = (List<ChartViewFieldDTO>) filterResult.getContext().get("allFields");
         ExtWhere2Str.extWhere2sqlOjb(sqlMeta, originFilter.getFilterList(), FieldUtil.transFields(allFields), crossDs, dsMap, Utils.getParams(FieldUtil.transFields(allFields)), view.getCalParams(), pluginManage);
+        originFilter.setDrill(filterResult
+                .getFilterList()
+                .stream()
+                .anyMatch(ele -> ele.getFilterType() == 1));
         var rightResult = (T) super.calcChartResult(view, formatResult2, originFilter, sqlMap, sqlMeta, provider);
+
         try {
             //如果有同环比过滤,应该用原始sql
             var originSql = rightResult.getQuerySql();
diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/CustomFilterResult.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/CustomFilterResult.java
index 37692f8ddb..1ba8c532ac 100644
--- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/CustomFilterResult.java
+++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/CustomFilterResult.java
@@ -13,4 +13,10 @@ import java.util.Map;
 public class CustomFilterResult {
     private List<ChartExtFilterDTO> filterList;
     private Map<String, Object> context;
+    private boolean isDrill;// 组合图右轴判断是否下钻字段，其余地方没有用
+
+    public CustomFilterResult(List<ChartExtFilterDTO> filterList, Map<String, Object> context) {
+        this.filterList = filterList;
+        this.context = context;
+    }
 }