diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 20e6a9d1da..dff8a3db49 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -345,12 +345,13 @@ public class FlowTaskService extends MybatisBaseService hisFlowList = new ArrayList<>(); // 使用一个线程安全的集合来存储结果 List finalHisFlowList = Collections.synchronizedList(hisFlowList); + List resultList = Collections.synchronizedList(new ArrayList<>()); // 使用 parallelStream 前先进行 null 检查和过滤 Map finalUserMap = userMap; - hisFlowList = list.parallelStream() + list.parallelStream() .filter(histIns -> histIns != null && histIns.getTaskId() != null) // 过滤掉 histIns 或 histIns.getTaskId() 为 null 的元素 - .map(histIns -> { + .forEach(histIns -> { FlowTask flowTask = new FlowTask(); flowTask.setTaskId(histIns.getTaskId()); flowTask.setTaskName(histIns.getActivityName()); @@ -370,14 +371,6 @@ public class FlowTaskService extends MybatisBaseService taskUserInfos = new ArrayList<>(); // 处理审批人员 if (StringUtils.isNotBlank(histIns.getAssignee())) { - /* SysUserVo user = finalUserMap.get(histIns.getAssignee()); - if (user != null) { - TaskUserInfo taskUserInfo = new TaskUserInfo(); - taskUserInfo.setAssigneeName(user.getName()); - taskUserInfo.setAssigneeSid(user.getSid()); - taskUserInfo.setAssigneeHeadImage(fileUploadComponent.getUrlPrefix() + user.getHeadImage()); - flowTask.setTaskUserInfos(Collections.singletonList(taskUserInfo)); - }*/ List stringList = Arrays.asList(histIns.getAssignee().split(",")); for (int i = 0; i < stringList.size(); i++) { SysUserVo user = finalUserMap.get(stringList.get(i)); @@ -419,18 +412,18 @@ public class FlowTaskService extends MybatisBaseService