diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java index 34f65f5d3..bb8af2405 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java @@ -20,6 +20,7 @@ import org.dromara.workflow.domain.WfCategory; import org.dromara.workflow.domain.bo.ProcessDefinitionBo; import org.dromara.workflow.domain.vo.ProcessDefinitionVo; import org.dromara.workflow.service.IActProcessDefinitionService; +import org.dromara.workflow.service.IWfCategoryService; import org.flowable.editor.constants.ModelDataJsonConstants; import org.flowable.engine.HistoryService; import org.flowable.engine.ProcessMigrationService; @@ -55,7 +56,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer private final ProcessMigrationService processMigrationService; - private final WfCategoryServiceImpl wfCategoryService; + private final IWfCategoryService iWfCategoryService; /** * 分页查询 @@ -205,7 +206,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer return true; } catch (Exception e) { e.printStackTrace(); - throw new ServiceException("操作失败:"+e.getMessage()); + throw new ServiceException("操作失败:" + e.getMessage()); } } @@ -280,8 +281,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer @Override public boolean deployByFile(MultipartFile file, String categoryCode) { try { - - WfCategory wfCategory = wfCategoryService.queryByCategoryCode(categoryCode); + WfCategory wfCategory = iWfCategoryService.queryByCategoryCode(categoryCode); if (wfCategory == null) { throw new ServiceException("流程分类不存在"); } diff --git a/script/bpmn/请假流程(子流程)-leave6.zip b/script/bpmn/请假流程(子流程)-leave6.zip new file mode 100644 index 000000000..ded3cea92 Binary files /dev/null and b/script/bpmn/请假流程(子流程)-leave6.zip differ diff --git a/script/bpmn/请假流程(边界定时任务)-leave7.zip b/script/bpmn/请假流程(边界定时任务)-leave7.zip new file mode 100644 index 000000000..bd553753a Binary files /dev/null and b/script/bpmn/请假流程(边界定时任务)-leave7.zip differ