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

update ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java.

Browse Source 
按照作者的代码方式重新修改。

Signed-off-by: Brath <l2634490675@163.com>
This commit is contained in:
Brath
2023-04-26 07:05:02 +00:00
committed by Gitee
parent d0f15ebaf8
commit db7be5772b
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -764,12 +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()));
//@author Brath
//避免空集合导致的NULL空指针 //@update by Brath：避免空集合导致的NULL空指针
if (formInfoList.size() == 0) WfDeployFormVo formInfo = formInfoList.stream().findFirst().orElse(null);
continue;
WfDeployFormVo formInfo = formInfoList.iterator().next();
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);