mirror of
https://gitee.com/dromara/RuoYi-Vue-Plus.git
synced 2026-03-22 21:39:01 +08:00
Merge remote-tracking branch 'origin/dev' into futuer/boot4
This commit is contained in:
@@ -224,6 +224,13 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
|
||||
log.warn("未找到对应的流程实例信息,无法执行删除操作。");
|
||||
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));
|
||||
}
|
||||
|
||||
@@ -242,6 +249,13 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
|
||||
log.warn("未找到对应的流程实例信息,无法执行删除操作。");
|
||||
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(
|
||||
defService.getByIds(StreamUtils.toList(instances, Instance::getDefinitionId)),
|
||||
@@ -277,6 +291,13 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
|
||||
log.warn("未找到对应的流程实例信息,无法执行删除操作。");
|
||||
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(
|
||||
defService.getByIds(StreamUtils.toList(instances, Instance::getDefinitionId)),
|
||||
|
||||
Reference in New Issue
Block a user