From 49e13fb77d74f4db2d7747e5d09ccdbc637f1780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?= <42510293+ziyujiahao@users.noreply.github.com> Date: Tue, 11 Mar 2025 13:29:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E3=80=81=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=A8=A1=E6=9D=BF=E4=BD=BF=E7=94=A8Excel?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E6=97=B6=EF=BC=8C=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=97=A0=E5=85=B3=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=EF=BC=8C=E5=88=9B=E5=BB=BA=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E5=90=8E=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=20(#15270)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visualization/server/DataVisualizationServer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index 9ff6d217b6..df00c3159b 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -334,10 +334,12 @@ public class DataVisualizationServer implements DataVisualizationApi { //表名映射更新 Map appDsTableNamesMap = dsTableNamesMap.get(key); Map systemDsTableNamesMap = dsTableNamesMap.get(value); - if (!CollectionUtils.isEmpty(appDsTableNamesMap) && !CollectionUtils.isEmpty(systemDsTableNamesMap)) { + if (!CollectionUtils.isEmpty(appDsTableNamesMap)) { appDsTableNamesMap.forEach((keyName, valueName) -> { - if (StringUtils.isNotEmpty(systemDsTableNamesMap.get(keyName))) { + if (!CollectionUtils.isEmpty(systemDsTableNamesMap) && StringUtils.isNotEmpty(systemDsTableNamesMap.get(keyName))) { dsGroup.setInfo(dsGroup.getInfo().replaceAll(valueName, systemDsTableNamesMap.get(keyName))); + }else{ + dsGroup.setInfo(dsGroup.getInfo().replaceAll(valueName, "excel_can_not_find")); } }); }