From f2931df35d4d432df970844e0821e5610aea11cf Mon Sep 17 00:00:00 2001 From: wisonic Date: Tue, 16 Dec 2025 18:38:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=B7=B7=E5=90=88=E5=9B=BE=E5=89=AF=E5=80=BC=E8=BD=B4=E5=92=8C?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E6=97=A5=E6=9C=9F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=81=94=E5=8A=A8=E6=97=B6=E5=90=8C=E7=8E=AF=E6=AF=94?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/chart/charts/impl/mix/MixHandler.java | 10 +++++++++- 1 file changed, 9 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 4b6e000981..74cc0b0bb1 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 @@ -3,11 +3,14 @@ package io.dataease.chart.charts.impl.mix; import io.dataease.api.dataset.union.DatasetGroupInfoDTO; import io.dataease.chart.charts.impl.YoyChartHandler; import io.dataease.chart.utils.ChartDataBuild; +import io.dataease.engine.trans.ExtWhere2Str; +import io.dataease.engine.utils.Utils; import io.dataease.extensions.datasource.dto.DatasourceRequest; import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; import io.dataease.extensions.datasource.model.SQLMeta; import io.dataease.extensions.datasource.provider.Provider; import io.dataease.extensions.view.dto.*; +import io.dataease.extensions.view.util.FieldUtil; import lombok.Getter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -146,9 +149,14 @@ public class MixHandler extends YoyChartHandler { formatResult.getContext().put("subAxisMap", axisMap); - + var originFilter = filterResult.getContext().get("originFilter"); + if (originFilter != null) { + filterResult.setFilterList((List) originFilter); + } // 右轴重新检测同环比过滤 customFilter(view, filterResult.getFilterList(), rightFormatResult); + var allFields = (List) filterResult.getContext().get("allFields"); + ExtWhere2Str.extWhere2sqlOjb(sqlMeta, filterResult.getFilterList(), FieldUtil.transFields(allFields), crossDs, dsMap, Utils.getParams(FieldUtil.transFields(allFields)), view.getCalParams(), pluginManage); var rightResult = (T) super.calcChartResult(view, rightFormatResult, filterResult, sqlMap, sqlMeta, provider); try { //如果有同环比过滤,应该用原始sql