Merge branch 'feature/REQ-5965' into dev

This commit is contained in:
wangli 2025-11-10 15:29:12 +08:00
commit 8e4b009483

View File

@ -22,7 +22,6 @@ import cn.axzo.workflow.core.service.ExtAxReModelService;
import cn.axzo.workflow.server.common.util.RpcExternalUtil; import cn.axzo.workflow.server.common.util.RpcExternalUtil;
import cn.axzo.workflow.server.common.util.WpsUtil; import cn.axzo.workflow.server.common.util.WpsUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.ListUtils;
import org.flowable.bpmn.model.Process; import org.flowable.bpmn.model.Process;
import org.flowable.common.engine.impl.interceptor.CommandExecutor; import org.flowable.common.engine.impl.interceptor.CommandExecutor;
import org.flowable.engine.RuntimeService; import org.flowable.engine.RuntimeService;
@ -103,7 +102,9 @@ public class FirstCopyTemplateFileTaskEvent_105_Listener extends AbstractBpmnEve
// 业务自定义文档 // 业务自定义文档
RuntimeService runtimeService = processEngineConfiguration.getRuntimeService(); RuntimeService runtimeService = processEngineConfiguration.getRuntimeService();
List<CustomDocDTO> customDocs = ListUtils.emptyIfNull(runtimeService.getVariable(processInstanceId, SIGN_BIZ_CUSTOM_DOCS, List.class)); List<CustomDocDTO> customDocs = Optional.ofNullable(
runtimeService.getVariable(processInstanceId, SIGN_BIZ_CUSTOM_DOCS, List.class))
.orElse(Collections.emptyList());
if (CollectionUtils.isEmpty(docs)) { if (CollectionUtils.isEmpty(docs)) {
processSign.setDocTemplate(Collections.emptyList()); processSign.setDocTemplate(Collections.emptyList());