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

Pre Merge pull request !874 from 描述不符/5.X

Browse Source
This commit is contained in:
描述不符 2026-07-17 05:40:37 +00:00 committed by Gitee
commit 3574c94474
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
View File

@ -195,7 +195,13 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
}
// 发送事件
processDeleteHandler(flowInstances);
return insService.remove(StreamUtils.toList(flowInstances, FlowInstance::getId));
// 删除抄送
List<Long> instanceIds = StreamUtils.toList(flowInstances, FlowInstance::getId);
List<FlowHisTask> flowHisTaskList = flowHisTaskMapper.selectList(new LambdaQueryWrapper<>(FlowHisTask.class).eq(FlowHisTask::getFlowStatus, TaskStatusEnum.COPY.getStatus()).in(FlowHisTask::getInstanceId, instanceIds));
if (CollUtil.isNotEmpty(flowHisTaskList)) {
FlowEngine.userService().deleteByTaskIds(StreamUtils.toList(flowHisTaskList, FlowHisTask::getTaskId));
}
return insService.remove(instanceIds);
}
/**
@ -214,6 +220,11 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
}
// 发送事件
processDeleteHandler(flowInstances);
// 删除抄送
List<FlowHisTask> flowHisTaskList = flowHisTaskMapper.selectList(new LambdaQueryWrapper<>(FlowHisTask.class).eq(FlowHisTask::getFlowStatus, TaskStatusEnum.COPY.getStatus()).in(FlowHisTask::getInstanceId, instanceIds));
if (CollUtil.isNotEmpty(flowHisTaskList)) {
FlowEngine.userService().deleteByTaskIds(StreamUtils.toList(flowHisTaskList, FlowHisTask::getTaskId));
}
// 删除实例
return insService.remove(instanceIds);
}
@ -234,9 +245,11 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
}
// 发送事件
processDeleteHandler(flowInstances);
List<FlowHisTask> flowHisTaskList = flowHisTaskMapper.selectList(new LambdaQueryWrapper<>(FlowHisTask.class).eq(FlowHisTask::getFlowStatus, TaskStatusEnum.COPY.getStatus()).in(FlowHisTask::getInstanceId, instanceIds));
List<FlowTask> flowTaskList = flwTaskService.selectByInstIds(instanceIds);
if (CollUtil.isNotEmpty(flowTaskList)) {
FlowEngine.userService().deleteByTaskIds(StreamUtils.toList(flowTaskList, FlowTask::getId));
List<Long> taskIdList = CollUtil.unionAll(StreamUtils.toList(flowTaskList, FlowTask::getId), StreamUtils.toList(flowHisTaskList, FlowHisTask::getTaskId));
if (CollUtil.isNotEmpty(taskIdList)) {
FlowEngine.userService().deleteByTaskIds(taskIdList);
}
FlowEngine.taskService().deleteByInsIds(instanceIds);
FlowEngine.hisTaskService().deleteByInsIds(instanceIds);