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

Merge branch 'feature/REQ-5965' into dev

Browse Source
This commit is contained in:
wangli 2025-11-10 15:17:48 +08:00
commit 20bf9e4d7b
1 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/FirstCopyTemplateFileTaskEvent_105_Listener.java
View File

@ -104,10 +104,12 @@ public class FirstCopyTemplateFileTaskEvent_105_Listener extends AbstractBpmnEve
RuntimeService runtimeService = processEngineConfiguration.getRuntimeService(); RuntimeService runtimeService = processEngineConfiguration.getRuntimeService();
List<CustomDocDTO> customDocs = runtimeService.getVariable(processInstanceId, SIGN_BIZ_CUSTOM_DOCS, List.class); List<CustomDocDTO> customDocs = runtimeService.getVariable(processInstanceId, SIGN_BIZ_CUSTOM_DOCS, List.class);
if (CollectionUtils.isEmpty(docs) && CollectionUtils.isEmpty(customDocs)) { if (CollectionUtils.isEmpty(docs)) {
processSign.setDocTemplate(Collections.emptyList()); processSign.setDocTemplate(Collections.emptyList());
}
if (CollectionUtils.isEmpty(customDocs)) {
processSign.setFileArchive(Collections.emptyList()); processSign.setFileArchive(Collections.emptyList());
} else { }
// 复制基础模板 // 复制基础模板
List<SignFileDTO> docTemplates = copyTempTemplate(docs); List<SignFileDTO> docTemplates = copyTempTemplate(docs);
@ -147,7 +149,6 @@ public class FirstCopyTemplateFileTaskEvent_105_Listener extends AbstractBpmnEve
List<SignFileDTO> archives = replaceTemplateVariable(docTemplates, processEngineConfiguration, processInstanceId); List<SignFileDTO> archives = replaceTemplateVariable(docTemplates, processEngineConfiguration, processInstanceId);
processSign.setFileArchive(archives); processSign.setFileArchive(archives);
}
// 没有可用的文档，但仍然记录库表 // 没有可用的文档，但仍然记录库表
extAxProcessSignService.save(processSign); extAxProcessSignService.save(processSign);
} }