Merge branch 'feature/REQ-2752' into feature/merge_2924_2752
This commit is contained in:
commit
0943c9866a
@ -35,19 +35,18 @@ public class CustomGetHistoricVariablesCmd implements Command<List<HistoricVaria
|
||||
ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration(commandContext);
|
||||
HistoryService historyService = processEngineConfiguration.getHistoryService();
|
||||
|
||||
if(StringUtils.hasText(processInstanceId) && !CollectionUtils.isEmpty(variableNames)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
NativeHistoricVariableInstanceQuery query = historyService.createNativeHistoricVariableInstanceQuery()
|
||||
.sql(buildQuerySql(commandContext))
|
||||
.parameter("processInstanceId", processInstanceId);
|
||||
if (!CollectionUtils.isEmpty(variableNames)) {
|
||||
for (int i = 0; i < variableNames.size(); i++) {
|
||||
query.parameter("variableName" + i, variableNames.get(i));
|
||||
if (StringUtils.hasText(processInstanceId) && !CollectionUtils.isEmpty(variableNames)) {
|
||||
NativeHistoricVariableInstanceQuery query = historyService.createNativeHistoricVariableInstanceQuery()
|
||||
.sql(buildQuerySql(commandContext))
|
||||
.parameter("processInstanceId", processInstanceId);
|
||||
if (!CollectionUtils.isEmpty(variableNames)) {
|
||||
for (int i = 0; i < variableNames.size(); i++) {
|
||||
query.parameter("variableName" + i, variableNames.get(i));
|
||||
}
|
||||
}
|
||||
return query.list();
|
||||
}
|
||||
|
||||
return query.list();
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
private String buildQuerySql(CommandContext commandContext) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user