From 85cfb15f520c8a8da5c26fc75ad4bcb3bbc2c2ff Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Wed, 25 Sep 2024 18:09:59 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-135341=20=E3=80=90fr-fbp=E5=9B=9E?= =?UTF-8?q?=E5=BD=92=E3=80=91=E6=A0=91=E6=95=B0=E6=8D=AE=E9=9B=86=E6=9E=84?= =?UTF-8?q?=E9=80=A0=E5=A4=B1=E8=B4=A5=20&=20REPORT-135830=20=E3=80=90fr-f?= =?UTF-8?q?bp=E5=9B=9E=E5=BD=92=E3=80=91=E6=96=B0=E5=BB=BA=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=A9=BA=E7=99=BD=EF=BC=8C=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=86=8D=E7=BC=96=E8=BE=91=E5=8F=AF=E6=AD=A3=E5=B8=B8=E9=A2=84?= =?UTF-8?q?=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/data/DesignTableDataManager.java | 10 ++++++++-- 1 file changed, 8 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 09da7a83be..5ae8bc7fc5 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 @@ -9,8 +9,10 @@ import com.fr.data.MultiResultTableData; import com.fr.data.TableDataSource; import com.fr.data.TableDataSourceTailor; import com.fr.data.core.DataCoreXmlUtils; +import com.fr.data.impl.ConditionTableData; import com.fr.data.impl.EmbeddedTableData; import com.fr.data.impl.NameDataModel; +import com.fr.data.impl.RecursionTableData; import com.fr.data.impl.storeproc.ProcedureDataModel; import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.data.impl.storeproc.StoreProcedureConstants; @@ -589,7 +591,7 @@ public abstract class DesignTableDataManager { bean.setStart(rowCount); bean.setEnd(-1); bean.updateConvertMap(parameterMap); - if (checkBean(bean)) { + if (checkBean(bean, tabledata)) { return (EmbeddedTableData) TableDataRepository.getInstance().previewTableData(bean).getTableData(); } else { PreviewDataBean dataBean = new PreviewDataBean(); @@ -624,7 +626,11 @@ public abstract class DesignTableDataManager { } } - private static boolean checkBean(PreviewSourceBean bean) { + private static boolean checkBean(PreviewSourceBean bean, TableData tableData) { + if (tableData instanceof ConditionTableData || tableData instanceof RecursionTableData) { + bean.getDataSource().putTableData(StringUtils.EMPTY, tableData); + return true; + } // dataName为空说明是新建的,得用tabledata传 return !bean.getDataName().isEmpty(); }