admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修复查询办理人错误使用

Browse Source
This commit is contained in:
AprilWind 2025-05-12 18:11:32 +08:00
parent 553fca28a2
commit b9e5914bab
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java
View File

@ -28,6 +28,6 @@ public interface IFlwTaskAssigneeService {
* @param storageIds 多个存储标识符字符串（逗号分隔） * @param storageIds 多个存储标识符字符串（逗号分隔）
* @return 合并后的用户列表，去重后返回，非法格式的标识将被跳过 * @return 合并后的用户列表，去重后返回，非法格式的标识将被跳过
*/ */
List<UserDTO> fetchUsersByStorageIds(String storageIds); List<UserDTO> fetchUsersByStorageIds(List<String> storageIds);
} }

9
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java
View File

@ -72,10 +72,13 @@ public class FlwCommonServiceImpl implements IFlwCommonService {
IFlwTaskAssigneeService taskAssigneeService = SpringUtils.getBean(IFlwTaskAssigneeService.class); IFlwTaskAssigneeService taskAssigneeService = SpringUtils.getBean(IFlwTaskAssigneeService.class);
Map<String, List<User>> userListMap = StreamUtils.groupByKey(userList, User::getType); Map<String, List<User>> userListMap = StreamUtils.groupByKey(userList, User::getType);
for (Map.Entry<String, List<User>> entry : userListMap.entrySet()) { for (Map.Entry<String, List<User>> entry : userListMap.entrySet()) {
List<User> entryValue = entry.getValue(); List<String> processedBys = entry.getValue().stream()
String processedBys = StreamUtils.join(entryValue, User::getProcessedBy); .map(User::getProcessedBy)
.filter(StringUtils::isNotBlank)
.distinct()
.collect(Collectors.toList());
// 根据 processedBy 前缀判断处理人类型，分别获取用户列表 // 根据 processedBy 前缀判断处理人类型，分别获取用户列表
List<UserDTO> users = taskAssigneeService.fetchUsersByStorageId(processedBys); List<UserDTO> users = taskAssigneeService.fetchUsersByStorageIds(processedBys);
// 转换为 FlowUser 并添加到结果集合 // 转换为 FlowUser 并添加到结果集合
if (CollUtil.isNotEmpty(users)) { if (CollUtil.isNotEmpty(users)) {
users.forEach(dto -> { users.forEach(dto -> {

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

@ -176,7 +176,7 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand
public List<UserDTO> fetchUsersByStorageId(String storageId) { public List<UserDTO> fetchUsersByStorageId(String storageId) {
Pair<TaskAssigneeEnum, Long> parsed = this.parseStorageId(storageId); Pair<TaskAssigneeEnum, Long> parsed = this.parseStorageId(storageId);
if (parsed == null) { if (parsed == null) {
return Collections.emptyList(); return List.of();
} }
return this.getUsersByType(parsed.getKey(), Collections.singletonList(parsed.getValue())); return this.getUsersByType(parsed.getKey(), Collections.singletonList(parsed.getValue()));
} }
@ -190,9 +190,12 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand
* @return 合并后的用户列表，去重后返回，非法格式的标识将被跳过 * @return 合并后的用户列表，去重后返回，非法格式的标识将被跳过
*/ */
@Override @Override
public List<UserDTO> fetchUsersByStorageIds(String storageIds) { public List<UserDTO> fetchUsersByStorageIds(List<String> storageIds) {
if (CollUtil.isEmpty(storageIds)) {
return List.of();
}
Map<TaskAssigneeEnum, List<Long>> typeIdMap = new EnumMap<>(TaskAssigneeEnum.class); Map<TaskAssigneeEnum, List<Long>> typeIdMap = new EnumMap<>(TaskAssigneeEnum.class);
for (String storageId : storageIds.split(StrUtil.COMMA)) { for (String storageId : storageIds) {
Pair<TaskAssigneeEnum, Long> parsed = this.parseStorageId(storageId); Pair<TaskAssigneeEnum, Long> parsed = this.parseStorageId(storageId);
if (parsed != null) { if (parsed != null) {
typeIdMap.computeIfAbsent(parsed.getKey(), k -> new ArrayList<>()).add(parsed.getValue()); typeIdMap.computeIfAbsent(parsed.getKey(), k -> new ArrayList<>()).add(parsed.getValue());