From bb4206b6421d7e60c3019b9be083c1c01812b15a Mon Sep 17 00:00:00 2001 From: JiconYang Date: Mon, 28 Jul 2025 10:17:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[fix]=20=E8=A7=A3=E5=86=B3=E5=A7=94?= =?UTF-8?q?=E6=89=98=E3=80=81=E8=BD=AC=E5=8A=9E=E6=97=B6nextTasks=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E5=AF=BC=E8=87=B4=E7=A9=BA=E6=8C=87=E9=92=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/workflow/listener/WorkflowGlobalListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3da4e9751..88a4dbf5f 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 @@ -125,7 +125,7 @@ public class WorkflowGlobalListener implements GlobalListener { if (StringUtils.isNotBlank(status)) { flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, status, params, false); } - if (task != null && nextTasks.size() == 1 && flwCommonService.applyNodeCode(definition.getId()).equals(nextTasks.get(0).getNodeCode())) { + if (task != null && CollUtil.isNotEmpty(nextTasks) && nextTasks.size() == 1 && flwCommonService.applyNodeCode(definition.getId()).equals(nextTasks.get(0).getNodeCode())) { //如果为画线指定驳回 线条指定为驳回 驳回得节点为申请人节点 则修改流程状态为退回 flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, BusinessStatusEnum.BACK.getStatus(), params, false); //修改流程实例状态 From b952b99e1cb649b0060c7f78029fde5aa59db076 Mon Sep 17 00:00:00 2001 From: JiconYang Date: Tue, 2 Sep 2025 11:43:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[fix]=20=E8=A7=A3=E5=86=B3=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=B5=81=E9=80=9A=E7=9F=A5messageType=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=88=A4=E7=A9=BA=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/workflow/service/impl/FlwCommonServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java index d0b53853b..8f8d61eb0 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java @@ -49,7 +49,7 @@ public class FlwCommonServiceImpl implements IFlwCommonService { */ @Override public void sendMessage(String flowName, Long instId, List messageType, String message) { - if (CollUtil.isNotEmpty(messageType)) { + if (CollUtil.isEmpty(messageType)) { return; } IFlwTaskService flwTaskService = SpringUtils.getBean(IFlwTaskService.class);