From 47bb397682cb9e44bd60d907a4748eb04173461c Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 24 Oct 2024 14:17:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-138572=20=E3=80=90fr-fbp=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E3=80=90=E6=95=B0=E6=8D=AE=E6=BA=90=E3=80=91?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=B7=A6=E4=B8=8B=E8=A7=92=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=8A=A0=E5=8F=B7=E6=96=B0=E5=BB=BA=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=EF=BC=8C=E5=90=8D=E7=A7=B0=E4=B8=8D=E4=BC=9A=E5=92=8C=E5=B7=B2?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/data/DesignTableDataManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java index dcde4716b0..9c932f0370 100644 --- a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java +++ b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java @@ -1,7 +1,6 @@ package com.fr.design.data; import com.fanruan.ComponentUtils; -import com.fanruan.config.impl.data.TableDataConfigProviderFactory; import com.fr.base.StoreProcedureParameter; import com.fr.base.TableData; import com.fr.concurrent.NamedThreadFactory; @@ -20,6 +19,7 @@ import com.fr.data.impl.storeproc.StoreProcedureHelper; import com.fr.data.operator.DataOperator; import com.fr.design.DesignModelAdapter; import com.fr.design.data.datapane.preview.PreviewTablePane; +import com.fr.design.data.datapane.preview.TableDataBeanHelper; import com.fr.design.data.tabledata.wrapper.MultiResultTableDataNameWrapper; import com.fr.design.data.tabledata.wrapper.MultiResultTableDataWrapper; import com.fr.design.data.tabledata.wrapper.ServerTableDataWrapper; @@ -316,7 +316,7 @@ public abstract class DesignTableDataManager { names.add(entry.getKey()); } //服务器数据集 - Map tableDatas = TableDataConfigProviderFactory.getInstance().getTableDatas(); + Map tableDatas = TableDataBeanHelper.getServerTableDatas(); for (Map.Entry entry : tableDatas.entrySet()) { names.add(entry.getKey()); } From 5668d56e552948b4a1ab95d2b5b629bd548a86fd Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 24 Oct 2024 15:08:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-138544=20=E3=80=90fr-fbp=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=EF=BC=8C=E5=BC=82=E5=B8=B8=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A2=84=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/data/datapane/preview/TableDataBeanHelper.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java index 5efe1c8908..29750d1294 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java @@ -198,9 +198,8 @@ public class TableDataBeanHelper { tableData.setPageQuerySql(DataEncryptionHelper.decrypt(bean.getPageQuery())); } Connection connection = connectionMap.get(bean.getDatabase()); - if (connection != null) { - tableData.setDatabase(new NameDatabaseConnection(bean.getDatabase())); - } else { + tableData.setDatabase(new NameDatabaseConnection(bean.getDatabase())); + if (connection == null) { FineLoggerFactory.getLogger().info("not find conn by {}", bean.getDatabase()); } String sql = SqlUtils.clearSqlComments(DataEncryptionHelper.decrypt(bean.getQuery()));