Compare commits

...

2 Commits

Author SHA1 Message Date
wangli
e7357ed208 Merge branch 'feature/REQ-5965' into test 2025-12-19 23:42:27 +08:00
wangli
b94ca42ca0 feat(REQ-5965) - 优化审批同意时,记录操作人信息 2025-12-19 23:41:18 +08:00

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()
.setApproverName(approver.getAssignerName())
.setSignature(attachment.getUrl())
.setAdvice(advice)
.setResult(BpmnProcessTaskResultEnum.APPROVED.getDesc())
.setOperationTime(new Date())));
dto.getSignatures().add(0, new SignatureDTO.SignDetail()
.setApproverName(approver.getAssignerName())
.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())
);
if (!any.isPresent()) {
signatures.add(dto);
}