Merge branch 'feature/REQ-4100' into test
This commit is contained in:
commit
c24ff9bc03
@ -196,7 +196,7 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp
|
|||||||
if (!StringUtils.hasText(dto.getProcessInstanceId()) && !StringUtils.hasText(dto.getTaskId())) {
|
if (!StringUtils.hasText(dto.getProcessInstanceId()) && !StringUtils.hasText(dto.getTaskId())) {
|
||||||
throw new WorkflowEngineException(TASK_OPERATION_PARAM_INVALID);
|
throw new WorkflowEngineException(TASK_OPERATION_PARAM_INVALID);
|
||||||
}
|
}
|
||||||
if(!StringUtils.hasText(dto.getTaskId())) {
|
if (!StringUtils.hasText(dto.getTaskId()) && StringUtils.hasText(dto.getApprover().getPersonId())) {
|
||||||
dto.setTaskId(bpmnProcessTaskService.findTaskIdByInstanceIdAndPersonId(dto.getProcessInstanceId(), dto.getApprover().getPersonId()));
|
dto.setTaskId(bpmnProcessTaskService.findTaskIdByInstanceIdAndPersonId(dto.getProcessInstanceId(), dto.getApprover().getPersonId()));
|
||||||
}
|
}
|
||||||
populateUsersAvatar(dto.getApprover());
|
populateUsersAvatar(dto.getApprover());
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user