|
|
|
@ -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) { |
|
|
|
|