admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修复 结束监听器 flowParam 可能为null问题

Browse Source
This commit is contained in:
疯狂的狮子Li 2025-02-06 16:16:14 +08:00
parent 2c598f93ab
commit a87071b834
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
View File

@ -1,10 +1,12 @@
package org.dromara.workflow.listener; package org.dromara.workflow.listener;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.BusinessStatusEnum;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.warm.flow.core.dto.FlowParams;
import org.dromara.warm.flow.core.entity.Definition; import org.dromara.warm.flow.core.entity.Definition;
import org.dromara.warm.flow.core.entity.Instance; import org.dromara.warm.flow.core.entity.Instance;
import org.dromara.warm.flow.core.entity.Task; import org.dromara.warm.flow.core.entity.Task;
@ -84,12 +86,15 @@ public class WorkflowGlobalListener implements GlobalListener {
String businessId = instance.getBusinessId(); String businessId = instance.getBusinessId();
String flowStatus = instance.getFlowStatus(); String flowStatus = instance.getFlowStatus();
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
// 历史任务扩展(通常为附件) FlowParams flowParams = listenerVariable.getFlowParams();
params.put("hisTaskExt", listenerVariable.getFlowParams().getHisTaskExt()); if (ObjectUtil.isNotNull(flowParams)) {
// 办理人 // 历史任务扩展(通常为附件)
params.put("handler", listenerVariable.getFlowParams().getHandler()); params.put("hisTaskExt", flowParams.getHisTaskExt());
// 办理意见 // 办理人
params.put("message", listenerVariable.getFlowParams().getMessage()); params.put("handler", flowParams.getHandler());
// 办理意见
params.put("message", flowParams.getMessage());
}
// 判断流程状态（发布：撤销，退回，作废，终止，已完成事件） // 判断流程状态（发布：撤销，退回，作废，终止，已完成事件）
String status = determineFlowStatus(instance, flowStatus); String status = determineFlowStatus(instance, flowStatus);
if (StringUtils.isNotBlank(status)) { if (StringUtils.isNotBlank(status)) {