From 7177f8afa4c36ed481fcab0e3692c3545a436c7b Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 3 Dec 2024 19:24:52 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E9=98=88=E5=80=BC=E5=91=8A=E8=AD=A6-=E6=95=B0=E5=80=BC?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E7=AD=89?= =?UTF-8?q?=E4=BA=8E=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/manage/ChartViewThresholdManage.java | 14 +++++++++++--- de-xpack | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java index c08d1c2a65..c63c17ae03 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java @@ -413,7 +413,7 @@ public class ChartViewThresholdManage { DatasetTableFieldDTO field = item.getField(); String dataeaseName = field.getDataeaseName(); String value = item.getValue(); - float tempFVal = 0f; + Float tempFVal = StringUtils.equalsAny(value, "min", "max") ? null : 0f; int validLen = 0; for (Map row : rows) { @@ -421,9 +421,17 @@ public class ChartViewThresholdManage { if (ObjectUtils.isEmpty(o)) continue; float fvalue = Float.parseFloat(o.toString()); if (StringUtils.equals("min", value)) { - tempFVal = Math.min(tempFVal, fvalue); + if (ObjectUtils.isEmpty(tempFVal)) { + tempFVal = fvalue; + } else { + tempFVal = Math.min(tempFVal, fvalue); + } } else if (StringUtils.equals("max", value)) { - tempFVal = Math.max(tempFVal, fvalue); + if (ObjectUtils.isEmpty(tempFVal)) { + tempFVal = fvalue; + } else { + tempFVal = Math.max(tempFVal, fvalue); + } } else if (StringUtils.equals("average", value)) { tempFVal += fvalue; validLen++; diff --git a/de-xpack b/de-xpack index 7669a4307a..d72300fcc5 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 7669a4307af32432eb22554f14b819d49c336695 +Subproject commit d72300fcc522eb25360827914057298d5f95dfff