Merge branch 'feature/REQ-5965' into dev
This commit is contained in:
commit
20bf9e4d7b
@ -104,10 +104,12 @@ public class FirstCopyTemplateFileTaskEvent_105_Listener extends AbstractBpmnEve
|
||||
RuntimeService runtimeService = processEngineConfiguration.getRuntimeService();
|
||||
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());
|
||||
}
|
||||
if (CollectionUtils.isEmpty(customDocs)) {
|
||||
processSign.setFileArchive(Collections.emptyList());
|
||||
} else {
|
||||
}
|
||||
// 复制基础模板
|
||||
List<SignFileDTO> docTemplates = copyTempTemplate(docs);
|
||||
|
||||
@ -147,7 +149,6 @@ public class FirstCopyTemplateFileTaskEvent_105_Listener extends AbstractBpmnEve
|
||||
|
||||
List<SignFileDTO> archives = replaceTemplateVariable(docTemplates, processEngineConfiguration, processInstanceId);
|
||||
processSign.setFileArchive(archives);
|
||||
}
|
||||
// 没有可用的文档,但仍然记录库表
|
||||
extAxProcessSignService.save(processSign);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user