From 9ac403fa50266bc11a738b6999eab99e548bc1f1 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 3 Nov 2023 10:55:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AC=A6=E5=8F=B7=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/chart/util/ChartDataBuild.java    | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java b/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
index 906ee1e517..db8fdd5e27 100644
--- a/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
+++ b/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
@@ -1069,30 +1069,18 @@ public class ChartDataBuild {
 
     // 表格
     public static Map<String, Object> transTableNormal(Map<String, List<ChartViewFieldDTO>> fieldMap, ChartViewWithBLOBs view, List<String[]> data, Map<String, ColumnPermissionItem> desensitizationList) {
+        String[] keys = new String[]{"labelAxis", "tooltipAxis"};
 
         List<ChartViewFieldDTO> fields = new ArrayList<>();
         List<ChartViewFieldDTO> yfields = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(fieldMap.get("xAxis"))) fields.addAll(fieldMap.get("xAxis"));
-        if (CollectionUtils.isNotEmpty(fieldMap.get("tooltipAxis"))) {
-            fieldMap.get("tooltipAxis").forEach(field -> {
-                Integer deType = field.getDeType();
-                if (deType == 2 || deType == 3) {
-                    yfields.add(field);
-                } else {
-                    fields.add(field);
-                }
-            });
-        }
-        if (CollectionUtils.isNotEmpty(fieldMap.get("labelAxis"))) {
-            fieldMap.get("labelAxis").forEach(field -> {
-                Integer deType = field.getDeType();
-                if (deType == 2 || deType == 3) {
-                    yfields.add(field);
-                } else {
-                    fields.add(field);
-                }
-            });
+
+        for (Map.Entry<String, List<ChartViewFieldDTO>> entry : fieldMap.entrySet()) {
+            if (StringUtils.equalsAny(entry.getKey(), keys)) {
+                fields.addAll(entry.getValue());
+            }
         }
+
         if (CollectionUtils.isNotEmpty(fieldMap.get("yAxis"))) fields.addAll(fieldMap.get("yAxis"));
         if (CollectionUtils.isNotEmpty(yfields)) fields.addAll(yfields);
         return transTableNormal(fields, view, data, desensitizationList);