Merge branch 'hotfix/node-alter' into test
This commit is contained in:
commit
c1c801f813
@ -69,16 +69,16 @@ public class NodeAlterJobHandler extends IJobHandler {
|
|||||||
jobs.forEach(e -> {
|
jobs.forEach(e -> {
|
||||||
XxlJobHelper.log("start execution of job: {}", JSON.toJSONString(e));
|
XxlJobHelper.log("start execution of job: {}", JSON.toJSONString(e));
|
||||||
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(e.getProcessInstanceId()).singleResult();
|
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(e.getProcessInstanceId()).singleResult();
|
||||||
|
if (Objects.isNull(processInstance)) {
|
||||||
|
executedJobs.add(e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (!refreshProperties.getAlterAllDefinitionKey()) {
|
if (!refreshProperties.getAlterAllDefinitionKey()) {
|
||||||
if (!ListUtils.emptyIfNull(refreshProperties.getAlterDefinitionKeys()).contains(processInstance.getProcessDefinitionKey())) {
|
if (!ListUtils.emptyIfNull(refreshProperties.getAlterDefinitionKeys()).contains(processInstance.getProcessDefinitionKey())) {
|
||||||
XxlJobHelper.log("skip alter by config");
|
XxlJobHelper.log("skip alter by config");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (Objects.isNull(processInstance)) {
|
|
||||||
executedJobs.add(e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
List<Task> tasks = taskService.createTaskQuery()
|
List<Task> tasks = taskService.createTaskQuery()
|
||||||
.processInstanceId(e.getProcessInstanceId())
|
.processInstanceId(e.getProcessInstanceId())
|
||||||
.taskDefinitionKey(e.getActivityId())
|
.taskDefinitionKey(e.getActivityId())
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user