xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-17 16:56:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 修复 撤销终止等操作 都变成退回的问题

Browse Source
This commit is contained in:
疯狂的狮子Li 2025-08-05 11:55:15 +08:00
parent 87ab6e1744
commit 4672d7de4d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
View File

@ -125,12 +125,15 @@ public class WorkflowGlobalListener implements GlobalListener {
if (StringUtils.isNotBlank(status)) { if (StringUtils.isNotBlank(status)) {
flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, status, params, false); flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, status, params, false);
} }
if (task != null && CollUtil.isNotEmpty(nextTasks) && nextTasks.size() == 1 && flwCommonService.applyNodeCode(definition.getId()).equals(nextTasks.get(0).getNodeCode())) { if (!BusinessStatusEnum.initialState(instance.getFlowStatus())) {
//如果为画线指定驳回 线条指定为驳回 驳回得节点为申请人节点 则修改流程状态为退回 if (task != null && CollUtil.isNotEmpty(nextTasks) && nextTasks.size() == 1
flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, BusinessStatusEnum.BACK.getStatus(), params, false); && flwCommonService.applyNodeCode(definition.getId()).equals(nextTasks.get(0).getNodeCode())) {
//修改流程实例状态 // 如果为画线指定驳回 线条指定为驳回 驳回得节点为申请人节点 则修改流程状态为退回
instance.setFlowStatus(BusinessStatusEnum.BACK.getStatus()); flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, BusinessStatusEnum.BACK.getStatus(), params, false);
insService.updateById(instance); // 修改流程实例状态
instance.setFlowStatus(BusinessStatusEnum.BACK.getStatus());
insService.updateById(instance);
}
} }
} }
//发布任务事件 //发布任务事件