From cd6bff013cd330f0236b208ee5c2d052650e6076 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期二, 18 八月 2026 10:50:42 +0800
Subject: [PATCH] fix: compile error in MesProTaskController for assigneeUserNames
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
index ff141d7..469aed2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
@@ -190,6 +190,8 @@
@Operation(summary = "鑾峰緱寰呮姤宸ュ彴璐﹀垎椤�", description = "宸叉帓浜т笖浠嶆湁寰呮姤宸ユ暟閲忕殑浠诲姟锛堢姸鎬�=杩涜涓級")
@PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<PageResult<MesProTaskRespVO>> getPendingFeedbackPage(@Valid MesProTaskPageReqVO pageReqVO) {
+ // 鏍规嵁褰撳墠鐧诲綍浜虹敤鎴穒d 鑾峰彇瀵瑰簲鐨勭敓浜у伐鍗曞垪琛�
+ pageReqVO.setAssigneeUserId(cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId());
PageResult<MesProTaskDO> pageResult = taskService.getPendingFeedbackPage(pageReqVO);
List<MesProTaskRespVO> respVOList = buildTaskRespVOList(pageResult.getList());
@@ -349,6 +351,15 @@
inTransitMap.merge(fb.getTaskId(), fbQty, BigDecimal::add);
}
}
+
+ // 鏌ヨ鎸囨淳鎶ュ伐浜哄憳
+ Set<Long> taskIds = convertSet(list, MesProTaskDO::getId);
+ Map<Long, List<cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskAssigneeDO>> assigneeMap = taskService.getTaskAssigneeMap(taskIds);
+ Set<Long> allAssigneeUserIds = new HashSet<>();
+ assigneeMap.values().forEach(assignees ->
+ assignees.forEach(assignee -> allAssigneeUserIds.add(assignee.getUserId())));
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(allAssigneeUserIds);
+
// 鎷兼帴 VO
return convertList(list, task -> {
MesProTaskRespVO vo = BeanUtils.toBean(task, MesProTaskRespVO.class);
@@ -379,6 +390,22 @@
findAndThen(processCheckMap, task.getProcessId(), vo::setCheckFlag));
findAndThen(routeProcessBackflushFlagMap, task.getRouteId(), processBackflushMap ->
findAndThen(processBackflushMap, task.getProcessId(), vo::setBackflushFlag));
+
+ // 璁剧疆鎸囨淳鎶ュ伐浜哄憳
+ List<cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskAssigneeDO> assignees = assigneeMap.get(task.getId());
+ if (CollUtil.isNotEmpty(assignees)) {
+ List<Long> assigneeUserIds = convertList(assignees, cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskAssigneeDO::getUserId);
+ vo.setAssigneeUserIds(assigneeUserIds);
+ List<String> assigneeUserNames = new ArrayList<>();
+ for (Long userId : assigneeUserIds) {
+ AdminUserRespDTO user = userMap.get(userId);
+ if (user != null && user.getNickname() != null) {
+ assigneeUserNames.add(user.getNickname());
+ }
+ }
+ vo.setAssigneeUserNames(assigneeUserNames);
+ }
+
return vo;
});
}
--
Gitblit v1.9.3