From f56e8438cac9b06d73283bace2f1f0e8806a3c0e Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Wed, 12 Jul 2023 17:52:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=EF=BC=9B=E4=BC=98=E5=8C=96=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 优化升级工具类；优化组件数据查询方法 --- .../core/module/chart/service/BaseChartDataService.java | 3 +++ DataRoom/dataroom-server/src/test/java/DataMigrationTest.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/service/BaseChartDataService.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/service/BaseChartDataService.java index 73f8e5c1..9af70fc1 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/service/BaseChartDataService.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/service/BaseChartDataService.java @@ -55,6 +55,9 @@ public class BaseChartDataService { return null; } DataSetDataSource dataSetDataSource = (DataSetDataSource) dataSource; + if (StringUtils.isBlank(dataSetDataSource.getBusinessKey())) { + return null; + } IBaseDataSetService dataSetService = dataSetServiceFactory.buildById(dataSetDataSource.getBusinessKey()); DatasetEntity datasetEntity = dataSetService.getById(dataSetDataSource.getBusinessKey()); if (datasetEntity == null) { diff --git a/DataRoom/dataroom-server/src/test/java/DataMigrationTest.java b/DataRoom/dataroom-server/src/test/java/DataMigrationTest.java index c54fe714..ba29211e 100644 --- a/DataRoom/dataroom-server/src/test/java/DataMigrationTest.java +++ b/DataRoom/dataroom-server/src/test/java/DataMigrationTest.java @@ -308,6 +308,8 @@ public class DataMigrationTest { jsonConfig.put("className", "com.gccloud.dataset.entity.config.CustomDataSetConfig"); } String config = JSON.toJSONString(jsonConfig); + // 将 \\' 替换成 \' + config = config.replaceAll("\\\\\\\\'", "\\\\'"); String insertSql = getInsertSql(dataset, config); insertSqlList.add(insertSql); }