From 9f45188d6e89e48748e5686ec5d06bcc468de462 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Wed, 6 Jan 2021 09:24:34 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-44410=20=E5=8A=A0=E4=B8=AA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/DesignModelAdapter.java     | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java b/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java
index 02396cd5c..e5930ee91 100644
--- a/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java
+++ b/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java
@@ -281,12 +281,18 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
                                              TableData tableData,
                                              Map<String, ParameterProvider> map,
                                              Filter<ParameterProvider> filter) {
-        // 更新下缓存名称 替换下数据集名称
-        ParameterProvider[] providers =  tableDataParametersMap.remove(oldName);
-        if (providers != null) {
-            tableDataParametersMap.put(tdName, providers);
+
+        ParameterProvider[] providers = null;
+
+        if (!ComparatorUtils.equals(oldName, tdName)) {
+            // 更新下缓存名称 替换下数据集名称
+             providers =  tableDataParametersMap.remove(oldName);
+            if (providers != null) {
+                tableDataParametersMap.put(tdName, providers);
+            }
         }
 
+
         try {
             for (Map.Entry<String, ParameterProvider[]> entry : tableDataParametersMap.entrySet()) {
                 ParameterProvider[] parameterProviders;
@@ -309,8 +315,10 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
 
-        // 更新缓存
-        tableDataParametersMap.put(tdName, providers);
+        if (providers != null) {
+            // 更新缓存
+            tableDataParametersMap.put(tdName, providers);
+        }
     }
 
     protected void addGlobalParameters(Map<String, ParameterProvider> map) {