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 ab86a0d6f2..f7eb9bacc4 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
@@ -47,9 +47,11 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -71,8 +73,8 @@ public abstract class DesignTableDataManager {
      * 其实globalDsCache没有绝对的必要，只是为了操作方便。如果没有它，那么每次清空服务器数据集或者存储过程的时候，还要去遍历找一下，
      * 这个操作可能比较复杂 。 从减少代码复杂度的角度看，还是很有必要的
      */
-    private static java.util.Map<String, TableDataWrapper> globalDsCache = new java.util.HashMap<String, TableDataWrapper>();
-    private static java.util.Map<String, String> dsNameChangedMap = new HashMap<String, String>();
+    private static Map<String, TableDataWrapper> globalDsCache = new java.util.HashMap<String, TableDataWrapper>();
+    private static Set<NameChangeBean> dsNameChangedSet = new LinkedHashSet<>();
     private static List<ChangeListener> globalDsListeners = new ArrayList<>();
 
     private static Map<String, List<ChangeListener>> dsListenersMap = new ConcurrentHashMap<>();
@@ -123,7 +125,7 @@ public abstract class DesignTableDataManager {
     public static void envChange() {
         columnCache.clear();
         dsListenersMap.clear();
-        dsNameChangedMap.clear();
+        dsNameChangedSet.clear();
         clearGlobalDs();
     }
 
@@ -136,17 +138,17 @@ public abstract class DesignTableDataManager {
     public static void fireDSChanged(Map<String, String> dsNameChangedMap) {
         clearGlobalDs();
         if (!dsNameChangedMap.isEmpty()) {
-            setDsNameChangedMap(dsNameChangedMap);
+            setDsNameChangedSet(dsNameChangedMap);
         }
         fireDsChanged();
         dsNameChangedMap.clear();
     }
 
-    private static void setDsNameChangedMap(Map<String, String> map) {
+    private static void setDsNameChangedSet(Map<String, String> map) {
         Iterator iterator = map.keySet().iterator();
         while (iterator.hasNext()) {
             String key = (String) iterator.next();
-            dsNameChangedMap.put(key, map.get(key));
+            dsNameChangedSet.add(new NameChangeBean(key, map.get(key)));
         }
     }
 
@@ -157,23 +159,21 @@ public abstract class DesignTableDataManager {
      * @return 是则返回true
      */
     public static boolean isDsNameChanged(String oldDsName) {
-        return dsNameChangedMap.containsKey(oldDsName);
-    }
-
-    public static String getChangedDsNameByOldDsName(String oldDsName) {
-        String changeName;
-
-        if (isDsNameChanged(oldDsName)) {
-            changeName = dsNameChangedMap.get(oldDsName);
-        } else {
-            changeName = StringUtils.EMPTY;
+        for (NameChangeBean bean : dsNameChangedSet) {
+            if (ComparatorUtils.equals(oldDsName, bean.getOldName())) {
+                return true;
+            }
         }
+        return false;
+    }
 
-        if (StringUtils.isNotEmpty(changeName)) {
-            return getChangedDsNameByOldDsName(changeName);
-        } else {
-            return oldDsName;
+    public static String getChangedDsNameByOldDsName(String dsName) {
+        for (NameChangeBean bean : dsNameChangedSet) {
+            if (ComparatorUtils.equals(dsName, bean.getOldName())) {
+                dsName = bean.getChangedName();
+            }
         }
+        return dsName;
     }
 
     public static void addGlobalDsChangeListener(ChangeListener l) {
diff --git a/designer-base/src/main/java/com/fr/design/data/NameChangeBean.java b/designer-base/src/main/java/com/fr/design/data/NameChangeBean.java
new file mode 100644
index 0000000000..2d4caf44e3
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/data/NameChangeBean.java
@@ -0,0 +1,27 @@
+package com.fr.design.data;
+
+public class NameChangeBean {
+    private String oldName;
+    private String changedName;
+
+    public NameChangeBean(String oldName, String changedName) {
+        this.oldName = oldName;
+        this.changedName = changedName;
+    }
+
+    public String getOldName() {
+        return oldName;
+    }
+
+    public void setOldName(String oldName) {
+        this.oldName = oldName;
+    }
+
+    public String getChangedName() {
+        return changedName;
+    }
+
+    public void setChangedName(String changedName) {
+        this.changedName = changedName;
+    }
+}