From fda15198c7f462212869918b95114a8a24ee430f Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Wed, 3 Jul 2024 08:26:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF-=E6=95=A3?=
 =?UTF-8?q?=E7=82=B9=E5=9B=BE):=20=E4=BF=AE=E5=A4=8D=E6=95=A3=E7=82=B9?=
 =?UTF-8?q?=E5=9B=BE=E6=8F=90=E7=A4=BA=E6=98=BE=E7=A4=BA=E5=80=BC=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/chart/charts/impl/scatter/ScatterHandler.java   | 5 +++--
 .../main/java/io/dataease/chart/utils/ChartDataBuild.java    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/scatter/ScatterHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/scatter/ScatterHandler.java
index e84de4a2c7..90037d3dad 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/scatter/ScatterHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/scatter/ScatterHandler.java
@@ -35,10 +35,11 @@ public class ScatterHandler extends YoyChartHandler {
         boolean isDrill = filterResult.getFilterList().stream().anyMatch(ele -> ele.getFilterType() == 1);
         var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis);
         var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis);
+        var yAxisTemp = new ArrayList<>(yAxis);
         var extBubble = formatResult.getAxisMap().get(ChartAxis.extBubble);
         if (!extBubble.isEmpty()) {
             // 剔除气泡大小，移除一个
-            Iterator<ChartViewFieldDTO> iterator = yAxis.iterator();
+            Iterator<ChartViewFieldDTO> iterator = yAxisTemp.iterator();
             while (iterator.hasNext()) {
                 ChartViewFieldDTO obj = iterator.next();
                 if (obj.getId().equals(extBubble.getFirst().getId())) {
@@ -47,7 +48,7 @@ public class ScatterHandler extends YoyChartHandler {
                 }
             }
         }
-        Map<String, Object> result = ChartDataBuild.transScatterDataAntV(xAxis, yAxis, view, data, extBubble, isDrill);
+        Map<String, Object> result = ChartDataBuild.transScatterDataAntV(xAxis, yAxisTemp, view, data, extBubble, isDrill);
         return result;
     }
 }
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 a5c4b88e38..28698d4652 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
@@ -437,11 +437,11 @@ public class ChartDataBuild {
                     axisChartDataDTO.setValue(new BigDecimal(0));
                 }
                 axisChartDataDTO.setCategory(StringUtils.defaultIfBlank(yAxis.get(j).getChartShowName(), yAxis.get(j).getName()));
-                buildDynamicValue(view, axisChartDataDTO, row, size, extSize);
+                buildDynamicValue(view, axisChartDataDTO, row, size, ObjectUtils.isNotEmpty(extBubble)?extSize-1:extSize);
                 // pop
                 if (ObjectUtils.isNotEmpty(extBubble)) {
                     try {
-                        axisChartDataDTO.setPopSize(StringUtils.isEmpty(row[size - extBubble.size()]) ? null : new BigDecimal(row[size - extBubble.size()]));
+                        axisChartDataDTO.setPopSize(StringUtils.isEmpty(row[2]) ? null : new BigDecimal(row[2]));
                         ChartQuotaDTO bubbleQuotaDTO = new ChartQuotaDTO();
                         bubbleQuotaDTO.setId(extBubble.get(0).getId());
                         quotaList.add(bubbleQuotaDTO);