diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java index 1bb69c5b3..bab520838 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java @@ -65,7 +65,7 @@ public class RegionUtils { RegionUtils.ip2Region = Ip2Region.create(v4Config, v6Config); log.debug("IP工具初始化成功,加载IP地址库数据成功!"); } catch (Exception e) { - throw new ServiceException("Ip2RegionHelper初始化失败,原因:{}", e.getMessage()); + throw new ServiceException("RegionUtils初始化失败,原因:{}", e.getMessage()); } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java index 94c9b2c1d..0d228b285 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java @@ -93,4 +93,19 @@ public interface FlowConstant { */ String BUSINESS_CODE = "businessCode"; + /** + * 忽略-办理权限校验(true:忽略,false:不忽略) + */ + String VAR_IGNORE = "ignore"; + + /** + * 忽略-委派处理(true:忽略,false:不忽略) + */ + String VAR_IGNORE_DEPUTE = "ignoreDepute"; + + /** + * 忽略-会签票签处理(true:忽略,false:不忽略) + */ + String VAR_IGNORE_COOPERATE = "ignoreCooperate"; + } 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 488719e84..44917c2da 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 @@ -234,6 +234,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService { FlowParams flowParams = FlowParams.build() .handler(completeTaskBo.getHandler()) .variable(variables) + .ignore(Convert.toBool(variables.getOrDefault(VAR_IGNORE, false))) + .ignoreDepute(Convert.toBool(variables.getOrDefault(VAR_IGNORE_DEPUTE, false))) + .ignoreCooperate(Convert.toBool(variables.getOrDefault(VAR_IGNORE_COOPERATE, false))) .skipType(SkipType.PASS.getKey()) .message(completeTaskBo.getMessage()) .flowStatus(BusinessStatusEnum.WAITING.getStatus())