Merge branch 'feature/REQ-5965' into test

This commit is contained in:
wangli 2025-12-19 23:42:27 +08:00
commit e7357ed208

View File

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