From a335cf00026f3b2962a1f9ca74c96b731eeec7a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=B8=8D=E7=AC=A6?= <826801306@qq.com> Date: Mon, 22 Jun 2026 03:55:15 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=82=E5=B8=B8=E6=8D=95?= =?UTF-8?q?=E6=8D=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 描述不符 <826801306@qq.com> --- .../workflow/service/impl/FlwTaskServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index c4e417789..641e51c4e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -38,6 +38,7 @@ import org.dromara.warm.flow.core.enums.UserType; import org.dromara.warm.flow.core.service.*; import org.dromara.warm.flow.core.utils.ExpressionUtil; import org.dromara.warm.flow.core.utils.MapUtil; +import org.dromara.warm.flow.core.constant.ExceptionCons; import org.dromara.warm.flow.orm.entity.*; import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper; @@ -46,6 +47,7 @@ import org.dromara.warm.flow.orm.mapper.FlowTaskMapper; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.common.enums.TaskAssigneeType; import org.dromara.workflow.common.enums.TaskOperationEnum; +import org.dromara.warm.flow.core.exception.FlowException; import org.dromara.workflow.common.enums.TaskStatusEnum; import org.dromara.workflow.domain.FlowInstanceBizExt; import org.dromara.workflow.domain.bo.*; @@ -564,8 +566,11 @@ public class FlwTaskServiceImpl implements IFlwTaskService { try { List temp = nodeService.getNextNodeList(instance.getDefinitionId(), startNode.getNodeCode(), null, SkipType.PASS.getKey(), instance.getVariableMap()); getBackTaskNodes(nodes, instance, temp); - }catch(Exception e){ -// log.info(); + }catch(FlowException e){ + // 仅放行条件缺失异常 + if(!ExceptionCons.NULL_CONDITION_VALUE.equals(e.getMessage())){ + throw e; + } } } }