diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java index fb1de2903..76efa6366 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java @@ -10,7 +10,6 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ThreadUtils; import org.dromara.system.api.*; import org.dromara.system.api.domain.DeptDTO; import org.dromara.system.api.domain.TaskAssigneeDTO; @@ -29,7 +28,6 @@ import org.dromara.workflow.service.IFlwTaskAssigneeService; import org.springframework.stereotype.Service; import java.util.*; -import java.util.function.Supplier; import java.util.stream.Collectors; /** @@ -221,25 +219,16 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand } private List getUsersByTypes(Map> typeIdMap) { - List>> suppliers = typeIdMap.entrySet().stream() - .map(entry -> (Supplier>) () -> this.getUsersByType(entry.getKey(), entry.getValue())) - .toList(); - return ThreadUtils.virtualSubmitAll(suppliers).stream() + return typeIdMap.entrySet().stream() + .map(entry -> this.getUsersByType(entry.getKey(), entry.getValue())) .filter(CollUtil::isNotEmpty) .flatMap(Collection::stream) .toList(); } private Map> getNamesByTypes(Map> typeIdMap) { - List types = new ArrayList<>(typeIdMap.keySet()); - List>> suppliers = types.stream() - .map(type -> (Supplier>) () -> this.getNamesByType(type, typeIdMap.get(type))) - .toList(); - List> names = ThreadUtils.virtualSubmitAll(suppliers); Map> nameMap = new EnumMap<>(TaskAssigneeEnum.class); - for (int i = 0; i < types.size(); i++) { - nameMap.put(types.get(i), names.get(i)); - } + typeIdMap.forEach((type, ids) -> nameMap.put(type, this.getNamesByType(type, ids))); return nameMap; }