From e82960f9a3470b2f44c869c9c739957083920c90 Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <destiny.lin@fanruan.com>
Date: Wed, 25 Sep 2024 18:16:01 +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  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 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 5ae8bc7fc5..0c17bcb0e9 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
@@ -627,12 +627,15 @@ public abstract class DesignTableDataManager {
     }
 
     private static boolean checkBean(PreviewSourceBean bean, TableData tableData) {
-        if (tableData instanceof ConditionTableData || tableData instanceof RecursionTableData) {
-            bean.getDataSource().putTableData(StringUtils.EMPTY, tableData);
-            return true;
+        if (bean.getDataName().isEmpty()) {
+            if (tableData instanceof ConditionTableData || tableData instanceof RecursionTableData) {
+                bean.getDataSource().putTableData(StringUtils.EMPTY, tableData);
+                return true;
+            }
+            // dataName为空并且不为特殊的数据集说明是新建的,得用tabledata传
+            return false;
         }
-        // dataName为空说明是新建的,得用tabledata传
-        return !bean.getDataName().isEmpty();
+        return true;
     }
 
     private static boolean needInputParams(boolean mustInputParameters, ParameterProvider[] parameters) {