From d4b9e3283440fe30ce299ffdf4cd6a45865947dd Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 11 Jun 2025 17:05:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20[Bug]=20DM=20=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=EF=BC=8Cschema=20=E5=B8=A6=20"-"=20=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E6=95=B0=E6=8D=AE=E9=9B=86=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=E8=A1=A8=E6=8A=A5=E9=94=99=20#16310?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/dataset/manage/DatasetDataManage.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java index 463a9f7677..211d58db6e 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java @@ -60,6 +60,7 @@ import java.util.*; import java.util.stream.Collectors; import static io.dataease.chart.manage.ChartDataManage.START_END_SEPARATOR; +import static io.dataease.dataset.utils.TableUtils.format; /** * @Author Junjun @@ -126,7 +127,7 @@ public class DatasetDataManage { Map map = JsonUtil.parseObject(datasourceSchemaDTO.getConfiguration(), Map.class); if (!datasourceRequest.getIsCross()) { if (ObjectUtils.isNotEmpty(map.get("schema"))) { - sql = sql.replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + datasourceSchemaDTO.getSchemaAlias() + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX, map.get("schema").toString()); + sql = sql.replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + datasourceSchemaDTO.getSchemaAlias() + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX, String.format(format, map.get("schema").toString()) ); } else { sql = sql.replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + datasourceSchemaDTO.getSchemaAlias() + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX + "\\.", ""); }