wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-5965' into test

Browse Source
This commit is contained in:
wangli 2025-12-19 23:42:27 +08:00
commit e7357ed208
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskCmd.java
View File

@ -220,16 +220,16 @@ public class CustomApproveTaskCmd extends AbstractCommand<Void> implements Seria
.setActivityId(task.getTaskDefinitionKey()) .setActivityId(task.getTaskDefinitionKey())
.setActivityName(task.getName()) .setActivityName(task.getName())
.setSignatures(new ArrayList<>())); .setSignatures(new ArrayList<>()));
ListUtils.emptyIfNull(attachmentList).stream()
.filter(i -> Objects.equals(i.getType(), AttachmentTypeEnum.signature)) dto.getSignatures().add(0, new SignatureDTO.SignDetail()
.findFirst() .setApproverName(approver.getAssignerName())
.ifPresent(attachment -> dto.getSignatures().add(0, .setSignature(ListUtils.emptyIfNull(attachmentList).stream()
new SignatureDTO.SignDetail() .filter(i -> Objects.equals(i.getType(), AttachmentTypeEnum.signature))
.setApproverName(approver.getAssignerName()) .findFirst().orElse(new AttachmentDTO()).getUrl())
.setSignature(attachment.getUrl()) .setAdvice(advice)
.setAdvice(advice) .setResult(BpmnProcessTaskResultEnum.APPROVED.getDesc())
.setResult(BpmnProcessTaskResultEnum.APPROVED.getDesc()) .setOperationTime(new Date())
.setOperationTime(new Date()))); );
if (!any.isPresent()) { if (!any.isPresent()) {
signatures.add(dto); signatures.add(dto);
} }