diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java index a67a1f78e..de8afc8ce 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java @@ -57,13 +57,6 @@ public class BackProcessBo implements Serializable { /** * 流程变量 */ - private Map variables; + private Map variables = new HashMap<>(); - public Map getVariables() { - if (variables == null) { - return new HashMap<>(16); - } - variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue())); - return variables; - } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java index e24629352..5781d71b4 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java @@ -9,7 +9,6 @@ import java.io.Serializable; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; /** * 办理任务请求对象 @@ -61,7 +60,7 @@ public class CompleteTaskBo implements Serializable { /** * 流程变量 */ - private Map variables; + private Map variables = new HashMap<>(); /** * 弹窗选择的办理人 @@ -73,13 +72,4 @@ public class CompleteTaskBo implements Serializable { */ private String ext; - public Map getVariables() { - if (variables == null) { - variables = new HashMap<>(16); - return variables; - } - variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue())); - return variables; - } - } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java index 12f0653ef..9d0af4896 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java @@ -6,7 +6,6 @@ import java.io.Serial; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import java.util.Objects; /** * 下一节点信息 @@ -26,13 +25,6 @@ public class FlowNextNodeBo implements Serializable { /** * 流程变量 */ - private Map variables; + private Map variables = new HashMap<>(); - public Map getVariables() { - if (variables == null) { - return new HashMap<>(16); - } - variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue())); - return variables; - } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java index b31f4fa14..d30eb537a 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java @@ -1,7 +1,6 @@ package org.dromara.workflow.domain.bo; -import cn.hutool.core.util.ObjectUtil; import jakarta.validation.constraints.NotBlank; import lombok.Data; import org.dromara.common.core.validate.AddGroup; @@ -11,7 +10,6 @@ import java.io.Serial; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import java.util.Objects; /** * 启动流程对象 @@ -44,25 +42,11 @@ public class StartProcessBo implements Serializable { /** * 流程变量,前端会提交一个元素{'entity': {业务详情数据对象}} */ - private Map variables; + private Map variables = new HashMap<>(); /** * 流程业务扩展信息 */ - private FlowInstanceBizExt bizExt; + private FlowInstanceBizExt bizExt = new FlowInstanceBizExt(); - public Map getVariables() { - if (variables == null) { - return new HashMap<>(16); - } - variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue())); - return variables; - } - - public FlowInstanceBizExt getBizExt() { - if (ObjectUtil.isNull(bizExt)) { - bizExt = new FlowInstanceBizExt(); - } - return bizExt; - } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/NodeExtVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/NodeExtVo.java index 5fb3380b4..e3d796a6d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/NodeExtVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/NodeExtVo.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -40,6 +41,6 @@ public class NodeExtVo implements Serializable { *

* 根据扩展属性中 VariablesEnum 类型的数据生成,存储 key=value 格式的自定义参数 */ - private Map variables; + private Map variables = new HashMap<>(); }