jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

!713 update 优化StreamUtils使用以及岗位删除优化

Browse Source 
* update 优化命名含义
* update 优化StreamUtils使用以及岗位删除优化
This commit is contained in:
AprilWind
2025-07-02 05:17:18 +00:00
committed by 疯狂的狮子Li
parent d501e82541
commit debc73d7d4
14 changed files with 142 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.stream.Collectors;
import java.util.function.Function;
/**
* 流程实例 服务层实现
@ -203,9 +203,11 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
return false;
}
// 获取定义信息
Map<Long, Definition> definitionMap = defService.getByIds(
StreamUtils.toList(instances, Instance::getDefinitionId)
).stream().collect(Collectors.toMap(Definition::getId, definition -> definition));
Map<Long, Definition> definitionMap = StreamUtils.toMap(
defService.getByIds(StreamUtils.toList(instances, Instance::getDefinitionId)),
Definition::getId,
Function.identity()
);
// 逐一触发删除事件
instances.forEach(instance -> {

12
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java
View File

@ -12,9 +12,7 @@ import org.dromara.common.core.domain.dto.TaskAssigneeDTO;
import org.dromara.common.core.domain.dto.UserDTO;
import org.dromara.common.core.domain.model.TaskAssigneeBody;
import org.dromara.common.core.enums.FormatsType;
import org.dromara.common.core.service.DeptService;
import org.dromara.common.core.service.TaskAssigneeService;
import org.dromara.common.core.service.UserService;
import org.dromara.common.core.service.*;
import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.warm.flow.ui.dto.HandlerFunDto;
@ -45,6 +43,8 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand
private final TaskAssigneeService taskAssigneeService;
private final UserService userService;
private final DeptService deptService;
private final RoleService roleService;
private final PostService postService;
/**
* 获取办理人权限设置列表tabs页签
@ -216,9 +216,9 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand
private Map<Long, String> getNamesByType(TaskAssigneeEnum type, List<Long> ids) {
return switch (type) {
case USER -> userService.selectUserNamesByIds(ids);
case ROLE -> userService.selectRoleNamesByIds(ids);
case DEPT -> userService.selectDeptNamesByIds(ids);
case POST -> userService.selectPostNamesByIds(ids);
case ROLE -> roleService.selectRoleNamesByIds(ids);
case DEPT -> deptService.selectDeptNamesByIds(ids);
case POST -> postService.selectPostNamesByIds(ids);
};
}