Skip to content

refactor: approval attachment check #2284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fit2-zhao merged 1 commit into from
May 18, 2026
Merged

refactor: approval attachment check #2284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions backend/crm/src/main/java/cn/cordys/crm/approval/service/ApprovalActionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ public void sign(ApprovalAddSignRequest request, String userId, String orgId) {
handleNextApprovalNode(nextNode, instance, userId);
}
// 保存加签附件
saveInstanceAttachment(request.getAttachmentIds(), request.getInstanceId(), addSignTask.getId(), userId, orgId);
if (CollectionUtils.isNotEmpty(request.getAttachmentIds())) {
saveInstanceAttachment(request.getAttachmentIds(), request.getInstanceId(), addSignTask.getId(), userId, orgId);
}
}

/**
Expand All @@ -105,7 +107,9 @@ public void back(ApprovalReturnBackRequest request, String userId, String orgId)
// 保存执行任务
saveActionTask(request, ApprovalAction.BACK, userId, orgId, null);
// 保存退回附件
saveInstanceAttachment(request.getAttachmentIds(), request.getInstanceId(), backRecord.getId(), userId, orgId);
if (CollectionUtils.isNotEmpty(request.getAttachmentIds())) {
saveInstanceAttachment(request.getAttachmentIds(), request.getInstanceId(), backRecord.getId(), userId, orgId);
}
}

/**
Expand Down Expand Up @@ -296,7 +300,9 @@ private void saveApprovalRecord(ApprovalTask currentTask, String comment, List<S
record.setUpdateTime(System.currentTimeMillis());
record.setUpdateUser(currentUserId);
approvalRecordMapper.insert(record);
saveInstanceAttachment(attachmentIds, currentTask.getInstanceId(), record.getId(), currentUserId, orgId);
if (CollectionUtils.isNotEmpty(attachmentIds)) {
saveInstanceAttachment(attachmentIds, currentTask.getInstanceId(), record.getId(), currentUserId, orgId);
}
}

/**
Expand Down
Loading