Browse Source

REPORT-88426 模板数据集和服务器数据集重名时,保存模板会错误校验--修改一下,避免重复获取

release/11.0
John.Ying-应志浩 2 years ago
parent
commit
071b96c712
  1. 13
      designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

13
designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@ -301,11 +301,16 @@ public abstract class DesignTableDataManager {
*/
public static Set<String> getAllDSNamesWithoutPermissions(TableDataSource source) {
Set<String> names = new HashSet<>();
String[] allDSNames = getAllDSNames(source);
Map<String, TableData> tableDatas = TableDataConfig.getInstance().getTableDatas();
for (String dsName : allDSNames) {
names.add(dsName);
Map<String, TableDataWrapper> resMap = new HashMap<>();
// 模板数据集
addTemplateData(resMap, source);
// 存储过程
addStoreProcedureData(resMap);
for (Map.Entry<String, TableDataWrapper> entry : resMap.entrySet()) {
names.add(entry.getKey());
}
//服务器数据集
Map<String, TableData> tableDatas = TableDataConfig.getInstance().getTableDatas();
for (Map.Entry<String, TableData> entry : tableDatas.entrySet()) {
names.add(entry.getKey());
}

Loading…
Cancel
Save