abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修复错误判空

Browse Source
This commit is contained in:
AprilWind 2024-12-18 17:13:04 +08:00
parent 0f57f489aa
commit 5ca20c67c9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,6 +178,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
public boolean deleteByBusinessIds(List<Long> businessIds) { public boolean deleteByBusinessIds(List<Long> businessIds) {
List<FlowInstance> flowInstances = flowInstanceMapper.selectList(new LambdaQueryWrapper<FlowInstance>().in(FlowInstance::getBusinessId, businessIds)); List<FlowInstance> flowInstances = flowInstanceMapper.selectList(new LambdaQueryWrapper<FlowInstance>().in(FlowInstance::getBusinessId, businessIds));
if (CollUtil.isEmpty(flowInstances)) { if (CollUtil.isEmpty(flowInstances)) {
log.warn("未找到对应的流程实例信息，无法执行删除操作。");
return false; return false;
} }
return insService.remove(StreamUtils.toList(flowInstances, FlowInstance::getId)); return insService.remove(StreamUtils.toList(flowInstances, FlowInstance::getId));
@ -193,8 +194,8 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
public boolean deleteByInstanceIds(List<Long> instanceIds) { public boolean deleteByInstanceIds(List<Long> instanceIds) {
// 获取实例信息 // 获取实例信息
List<Instance> instances = insService.getByIds(instanceIds); List<Instance> instances = insService.getByIds(instanceIds);
if (instances.isEmpty()) { if (CollUtil.isNotEmpty(instances)) {
log.warn("未找到对应的实例信息，无法执行删除操作。"); log.warn("未找到对应的流程实例信息，无法执行删除操作。");
return false; return false;
} }
// 获取定义信息 // 获取定义信息
@ -206,7 +207,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
instances.forEach(instance -> { instances.forEach(instance -> {
Definition definition = definitionMap.get(instance.getDefinitionId()); Definition definition = definitionMap.get(instance.getDefinitionId());
if (ObjectUtil.isNull(definition)) { if (ObjectUtil.isNull(definition)) {
log.warn("实例 ID: {} 对应的定义信息未找到，跳过删除事件触发。", instance.getId()); log.warn("实例 ID: {} 对应的流程定义信息未找到，跳过删除事件触发。", instance.getId());
return; return;
} }
flowProcessEventHandler.processDeleteHandler(definition.getFlowCode(), instance.getBusinessId()); flowProcessEventHandler.processDeleteHandler(definition.getFlowCode(), instance.getBusinessId());