REPORT-27141 bugfix

designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataComboBox.java

@@ -2,6 +2,7 @@ package com.fr.design.data.datapane;
 
 import com.fr.data.TableDataSource;
 import com.fr.data.impl.RecursionTableData;
+import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.tabledata.wrapper.ServerTableDataWrapper;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
 import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
@@ -70,8 +71,14 @@ public class TreeTableDataComboBox extends UIComboBox {
 	}
 	
 	public void setSelectedTableDataByName(String name) {
-		TableDataWrapper tableDataWrappe = res_map.get(name);
-		this.getModel().setSelectedItem(tableDataWrappe);
+		TableDataWrapper tableDataWrapper;
+		if (res_map.get(name) != null) {
+			tableDataWrapper = res_map.get(name);
+		} else {
+			String changeName = DesignTableDataManager.getChangedDsNameByOldDsName(name);
+			tableDataWrapper = res_map.get(changeName);
+		}
+		this.getModel().setSelectedItem(tableDataWrapper);
 	}
 
 	@Override