opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-21 02:25:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add 添加文件，调整分类查询

Browse Source
This commit is contained in:
gssong 2023-11-26 20:48:56 +08:00
parent ce46dfd7aa
commit 67fa48e7a0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
View File

@ -20,6 +20,7 @@ import org.dromara.workflow.domain.WfCategory;
import org.dromara.workflow.domain.bo.ProcessDefinitionBo; import org.dromara.workflow.domain.bo.ProcessDefinitionBo;
import org.dromara.workflow.domain.vo.ProcessDefinitionVo; import org.dromara.workflow.domain.vo.ProcessDefinitionVo;
import org.dromara.workflow.service.IActProcessDefinitionService; import org.dromara.workflow.service.IActProcessDefinitionService;
import org.dromara.workflow.service.IWfCategoryService;
import org.flowable.editor.constants.ModelDataJsonConstants; import org.flowable.editor.constants.ModelDataJsonConstants;
import org.flowable.engine.HistoryService; import org.flowable.engine.HistoryService;
import org.flowable.engine.ProcessMigrationService; import org.flowable.engine.ProcessMigrationService;
@ -55,7 +56,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
private final ProcessMigrationService processMigrationService; private final ProcessMigrationService processMigrationService;
private final WfCategoryServiceImpl wfCategoryService; private final IWfCategoryService iWfCategoryService;
/** /**
* 分页查询 * 分页查询
@ -205,7 +206,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new ServiceException("操作失败:"+e.getMessage()); throw new ServiceException("操作失败:" + e.getMessage());
} }
} }
@ -280,8 +281,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
@Override @Override
public boolean deployByFile(MultipartFile file, String categoryCode) { public boolean deployByFile(MultipartFile file, String categoryCode) {
try { try {
WfCategory wfCategory = iWfCategoryService.queryByCategoryCode(categoryCode);
WfCategory wfCategory = wfCategoryService.queryByCategoryCode(categoryCode);
if (wfCategory == null) { if (wfCategory == null) {
throw new ServiceException("流程分类不存在"); throw new ServiceException("流程分类不存在");
} }

BIN
script/bpmn/请假流程（子流程）-leave6.zip Normal file
View File

Binary file not shown.

BIN
script/bpmn/请假流程（边界定时任务）-leave7.zip Normal file
View File

Binary file not shown.