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 661b14d237..484699306f 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 @@ -96,7 +96,7 @@ public class MixHandler extends YoyChartHandler { var req = new DatasourceRequest(); req.setDsList(dsMap); - List assists = dynamicAssistFields.stream().filter(ele -> !StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList(); + List assists = leftAssistFields.stream().filter(ele -> !StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList(); if (ObjectUtils.isNotEmpty(assists)) { var assistSql = assistSQL(originSql, assistFields, dsMap); req.setQuery(assistSql); @@ -106,7 +106,7 @@ public class MixHandler extends YoyChartHandler { leftResult.setDynamicAssistFields(assists); } - List assistsOriginList = dynamicAssistFields.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList(); + List assistsOriginList = leftAssistFields.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList(); if (ObjectUtils.isNotEmpty(assistsOriginList)) { var assistSqlOriginList = assistSQLOriginList(originSql, assistFields, dsMap); req.setQuery(assistSqlOriginList); @@ -168,7 +168,7 @@ public class MixHandler extends YoyChartHandler { var req = new DatasourceRequest(); req.setDsList(dsMap); - List assists = dynamicAssistFields.stream().filter(ele -> !StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList(); + List assists = rightAssistFields.stream().filter(ele -> !StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList(); if (ObjectUtils.isNotEmpty(assists)) { var assistSql = assistSQL(originSql, assistFields, dsMap); req.setQuery(assistSql); @@ -178,7 +178,7 @@ public class MixHandler extends YoyChartHandler { rightResult.setDynamicAssistFields(assists); } - List assistsOriginList = dynamicAssistFields.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList(); + List assistsOriginList = rightAssistFields.stream().filter(ele -> StringUtils.equalsIgnoreCase(ele.getSummary(), "last_item")).toList(); if (ObjectUtils.isNotEmpty(assistsOriginList)) { var assistSqlOriginList = assistSQLOriginList(originSql, assistFields, dsMap); req.setQuery(assistSqlOriginList);