From a87071b834105217e9720505171cd9f3c67178e4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 06 二月 2025 16:16:14 +0800
Subject: [PATCH] fix 修复 结束监听器 flowParam 可能为null问题
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
index e79fc3b..b187854 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
@@ -1,10 +1,12 @@
package org.dromara.workflow.listener;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.enums.BusinessStatusEnum;
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.Instance;
import org.dromara.warm.flow.core.entity.Task;
@@ -84,12 +86,15 @@
String businessId = instance.getBusinessId();
String flowStatus = instance.getFlowStatus();
Map<String, Object> params = new HashMap<>();
- // 鍘嗗彶浠诲姟鎵╁睍(閫氬父涓洪檮浠�)
- params.put("hisTaskExt", listenerVariable.getFlowParams().getHisTaskExt());
- // 鍔炵悊浜�
- params.put("handler", listenerVariable.getFlowParams().getHandler());
- // 鍔炵悊鎰忚
- params.put("message", listenerVariable.getFlowParams().getMessage());
+ FlowParams flowParams = listenerVariable.getFlowParams();
+ if (ObjectUtil.isNotNull(flowParams)) {
+ // 鍘嗗彶浠诲姟鎵╁睍(閫氬父涓洪檮浠�)
+ params.put("hisTaskExt", flowParams.getHisTaskExt());
+ // 鍔炵悊浜�
+ params.put("handler", flowParams.getHandler());
+ // 鍔炵悊鎰忚
+ params.put("message", flowParams.getMessage());
+ }
// 鍒ゆ柇娴佺▼鐘舵�侊紙鍙戝竷锛氭挙閿�锛岄��鍥烇紝浣滃簾锛岀粓姝紝宸插畬鎴愪簨浠讹級
String status = determineFlowStatus(instance, flowStatus);
if (StringUtils.isNotBlank(status)) {
--
Gitblit v1.9.3