Merge branch 'feature/dingdingLogin' into test
This commit is contained in:
commit
2bece54f66
@ -205,7 +205,15 @@ public class DangerOperationController {
|
||||
|
||||
String taskId = null;
|
||||
if (!Objects.equals("0", personId)) {
|
||||
taskId = taskService.findTaskIdByInstanceIdAndPersonId(jobParam.getProcessInstanceId(), jobParam.getPersonId());
|
||||
List<Task> tasks = flowableTaskService.createTaskQuery().active().list();
|
||||
if (CollectionUtils.isEmpty(tasks)) {
|
||||
return;
|
||||
}
|
||||
if (tasks.size() == 1) {
|
||||
taskId = tasks.get(0).getId();
|
||||
} else {
|
||||
taskId = taskService.findTaskIdByInstanceIdAndPersonId(jobParam.getProcessInstanceId(), jobParam.getPersonId());
|
||||
}
|
||||
}
|
||||
|
||||
ExtAxProcessLog query = new ExtAxProcessLog();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user