xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2026-06-27 16:14:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

update 优化代码小优化项

Browse Source 
- 抄送历史任务为空时改为明确的 ServiceException；当前任务办理人查询改为 ID 去重后批量远程查
- 流程图提示里用户 ID 去重，部门名称从循环内逐条Dubbo 调用改为一次批量查询
This commit is contained in:
疯狂的狮子Li
2026-06-08 17:26:32 +08:00
parent 3a6d62d695
commit 90f8142d0b
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java
+9 -9
View File
@@ -27,10 +27,7 @@ import org.dromara.workflow.common.constant.FlowConstant;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -74,10 +71,12 @@ public class FlwChartExtServiceImpl implements ChartExtService {
Map<String, List<FlowHisTask>> groupedByNode = StreamUtils.groupByKey(flowHisTasks, FlowHisTask::getNodeCode);
// 批量查询所有审批人的用户信息
List<UserDTO> userDTOList = userService.selectListByIds(StreamUtils.toList(flowHisTasks, e -> Convert.toLong(e.getApprover())));
List<UserDTO> userDTOList = userService.selectListByIds(StreamUtils.toSet(flowHisTasks, e -> Convert.toLong(e.getApprover())));
// 将查询到的用户列表转换为以用户ID为key的映射
Map<Long, UserDTO> userMap = StreamUtils.toIdentityMap(userDTOList, UserDTO::getUserId);
Set<Long> deptIds = StreamUtils.toSet(userDTOList, UserDTO::getDeptId);
Map<Long, String> deptNameMap = deptService.selectDeptNamesByIds(deptIds);
Map<String, String> dictType = dictService.getAllDictByDictType(FlowConstant.WF_TASK_STATUS);
@@ -100,7 +99,7 @@ public class FlwChartExtServiceImpl implements ChartExtService {
));
// 处理当前节点的扩展信息
this.processNodeExtInfo(nodeJson, latestPerApprover, userMap, dictType);
this.processNodeExtInfo(nodeJson, latestPerApprover, userMap, deptNameMap, dictType);
}
}
@@ -168,9 +167,11 @@ public class FlwChartExtServiceImpl implements ChartExtService {
* @param nodeJson 当前流程节点对象，包含节点基础信息和提示内容容器
* @param taskList 当前节点关联的历史审批任务列表，用于生成提示信息
* @param userMap 用户信息映射表，key 为用户ID，value 为用户DTO对象，用于获取审批人信息
* @param deptNameMap 部门名称映射表，key 为部门ID，value 为部门名称
* @param dictType 数据字典映射表，key 为字典项编码，value 为对应显示值，用于翻译审批状态等
*/
private void processNodeExtInfo(NodeJson nodeJson, List<FlowHisTask> taskList, Map<Long, UserDTO> userMap, Map<String, String> dictType) {
private void processNodeExtInfo(NodeJson nodeJson, List<FlowHisTask> taskList, Map<Long, UserDTO> userMap,
Map<Long, String> deptNameMap, Map<String, String> dictType) {
// 获取节点提示内容对象中的 info 列表，用于追加提示项
List<PromptContent.InfoItem> info = nodeJson.getPromptContent().getInfo();
@@ -182,8 +183,7 @@ public class FlwChartExtServiceImpl implements ChartExtService {
continue;
}
// 查询用户所属部门名称
String deptName = deptService.selectDeptNameByIds(Convert.toStr(userDTO.getDeptId()));
String deptName = deptNameMap.getOrDefault(userDTO.getDeptId(), StringUtils.EMPTY);
// 添加标题项，如：👤 张三（市场部）
info.add(new PromptContent.InfoItem()
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
+7 -3
View File
@@ -338,10 +338,14 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
return;
}
// 添加抄送人记录
FlowHisTask flowHisTask = flowHisTaskMapper.selectList(
List<FlowHisTask> flowHisTasks = flowHisTaskMapper.selectList(
QueryBuilder.lambda(FlowHisTask.class)
.eq(FlowHisTask::getTaskId, task.getId())
.build()).get(0);
.build());
if (CollUtil.isEmpty(flowHisTasks)) {
throw new ServiceException("流程历史任务不存在，无法添加抄送记录");
}
FlowHisTask flowHisTask = flowHisTasks.get(0);
FlowNode flowNode = new FlowNode();
flowNode.setNodeCode(flowHisTask.getTargetNodeCode());
flowNode.setNodeName(flowHisTask.getTargetNodeName());
@@ -897,7 +901,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
if (CollUtil.isEmpty(userList)) {
return Collections.emptyList();
}
return userService.selectListByIds(StreamUtils.toList(userList, e -> Convert.toLong(e.getProcessedBy())));
return userService.selectListByIds(StreamUtils.toSet(userList, e -> Convert.toLong(e.getProcessedBy())));
}
/**