public/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-03-23 05:44:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into futuer/boot4

Browse Source
This commit is contained in:
疯狂的狮子Li
2026-03-18 11:38:42 +08:00
parent b214817d0b 334c85ed61
commit d30e16cdd9
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,6 +224,13 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
log.warn("未找到对应的流程实例信息，无法执行删除操作。"); log.warn("未找到对应的流程实例信息，无法执行删除操作。");
return false; return false;
} }
String userId = LoginHelper.getUserIdStr();
for (FlowInstance instance : flowInstances) {
if (LoginHelper.isSuperAdmin() || instance.getCreateBy().equals(userId)) {
continue;
}
throw new ServiceException("权限不足，无法删除流程实例信息!");
}
return insService.remove(StreamUtils.toList(flowInstances, FlowInstance::getId)); return insService.remove(StreamUtils.toList(flowInstances, FlowInstance::getId));
} }
@@ -242,6 +249,13 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
log.warn("未找到对应的流程实例信息，无法执行删除操作。"); log.warn("未找到对应的流程实例信息，无法执行删除操作。");
return false; return false;
} }
String userId = LoginHelper.getUserIdStr();
for (Instance instance : instances) {
if (LoginHelper.isSuperAdmin() || instance.getCreateBy().equals(userId)) {
continue;
}
throw new ServiceException("权限不足，无法删除流程实例信息!");
}
// 获取定义信息 // 获取定义信息
Map<Long, Definition> definitionMap = StreamUtils.toMap( Map<Long, Definition> definitionMap = StreamUtils.toMap(
defService.getByIds(StreamUtils.toList(instances, Instance::getDefinitionId)), defService.getByIds(StreamUtils.toList(instances, Instance::getDefinitionId)),
@@ -277,6 +291,13 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
log.warn("未找到对应的流程实例信息，无法执行删除操作。"); log.warn("未找到对应的流程实例信息，无法执行删除操作。");
return false; return false;
} }
String userId = LoginHelper.getUserIdStr();
for (Instance instance : instances) {
if (LoginHelper.isSuperAdmin() || instance.getCreateBy().equals(userId)) {
continue;
}
throw new ServiceException("权限不足，无法删除流程实例信息!");
}
// 获取定义信息 // 获取定义信息
Map<Long, Definition> definitionMap = StreamUtils.toMap( Map<Long, Definition> definitionMap = StreamUtils.toMap(
defService.getByIds(StreamUtils.toList(instances, Instance::getDefinitionId)), defService.getByIds(StreamUtils.toList(instances, Instance::getDefinitionId)),