DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!45 【轻量级RP】Brath：已修改集合判断，请注意及时合并代码~

Browse Source 
Merge pull request !45 from Brath/develop
This commit is contained in:
KonBAI
2023-04-26 13:36:14 +00:00
committed by Gitee
parent f5c4095ecb db7be5772b
commit f3ef5c5ab7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java
View File

@@ -764,7 +764,10 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
.eq(WfDeployForm::getDeployId, historicProcIns.getDeploymentId()) .eq(WfDeployForm::getDeployId, historicProcIns.getDeploymentId())
.eq(WfDeployForm::getFormKey, formKey) .eq(WfDeployForm::getFormKey, formKey)
.eq(localScope, WfDeployForm::getNodeKey, flowElement.getId())); .eq(localScope, WfDeployForm::getNodeKey, flowElement.getId()));
WfDeployFormVo formInfo = formInfoList.iterator().next();
//@update by Brath：避免空集合导致的NULL空指针
WfDeployFormVo formInfo = formInfoList.stream().findFirst().orElse(null);
if (ObjectUtil.isNotNull(formInfo)) { if (ObjectUtil.isNotNull(formInfo)) {
// 旧数据 formInfo.getFormName() 为 null // 旧数据 formInfo.getFormName() 为 null
String formName = Optional.ofNullable(formInfo.getFormName()).orElse(StringUtils.EMPTY); String formName = Optional.ofNullable(formInfo.getFormName()).orElse(StringUtils.EMPTY);