Merge branch 'feature/REQ-7125' into dev
This commit is contained in:
commit
3f86cb0034
@ -63,17 +63,17 @@ public class CustomTransferUserTaskCmd extends AbstractCommand<Void> implements
|
||||
private final String advice;
|
||||
private final List<AttachmentDTO> attachmentList;
|
||||
private final BpmnTaskDelegateAssigner targetTaskAssignee;
|
||||
private final String additionalOpeDesc;
|
||||
private final String operationDesc;
|
||||
|
||||
public CustomTransferUserTaskCmd(String originTaskId, BpmnTaskDelegateAssigner originTaskAssignee, String advice,
|
||||
List<AttachmentDTO> attachmentList, BpmnTaskDelegateAssigner targetTaskAssignee,
|
||||
String additionalOpeDesc) {
|
||||
String operationDesc) {
|
||||
this.originTaskId = originTaskId;
|
||||
this.originTaskAssignee = originTaskAssignee;
|
||||
this.advice = advice;
|
||||
this.attachmentList = attachmentList;
|
||||
this.targetTaskAssignee = targetTaskAssignee;
|
||||
this.additionalOpeDesc = additionalOpeDesc;
|
||||
this.operationDesc = operationDesc;
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -147,7 +147,7 @@ public class CustomTransferUserTaskCmd extends AbstractCommand<Void> implements
|
||||
task.setScopeType("TRANSFER");
|
||||
|
||||
Authentication.setAuthenticatedUserId(originTaskAssignee.buildAssigneeId());
|
||||
addComment(commandContext, task, COMMENT_TYPE_OPERATION_DESC, "转交给" + targetTaskAssignee.getAssignerName() + (StringUtils.isNotBlank(additionalOpeDesc) ? additionalOpeDesc : ""));
|
||||
addComment(commandContext, task, COMMENT_TYPE_OPERATION_DESC, StringUtils.isNotBlank(operationDesc) ? operationDesc : "转交给" + targetTaskAssignee.getAssignerName());
|
||||
addComment(commandContext, task, COMMENT_TYPE_ADVICE, advice);
|
||||
Authentication.setAuthenticatedUserId(null);
|
||||
|
||||
|
||||
@ -813,7 +813,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
|
||||
commandExecutor.execute(new CustomTransferUserTaskAsyncCmd(dto));
|
||||
} else {
|
||||
commandExecutor.execute(new CustomTransferUserTaskCmd(dto.getTaskId(),
|
||||
dto.getOriginAssigner(), dto.getAdvice(), dto.getAttachmentList(), dto.getTargetAssigner(), dto.getAdditionalOpeDesc()));
|
||||
dto.getOriginAssigner(), dto.getAdvice(), dto.getAttachmentList(), dto.getTargetAssigner(), dto.getOperationDesc()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user