From 975fe5248cc1f3d999f4d660fc331570110c4968 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 08 十月 2026 13:38:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_塔河种业' into dev_新疆_塔河种业
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
index 6c4830a..05ba023 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
@@ -213,21 +213,13 @@
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
}
- // 1. 鑾峰緱鍏宠仈鏁版嵁锛堣矗浠讳汉銆佸搧绉嶇墿鏂欙級
+ // 1. 鑾峰緱鍏宠仈鏁版嵁锛堣矗浠讳汉锛夛紱鍝佺宸蹭笅娌夊埌琚嬬爜鏁版嵁鍖咃紝鎵规鍒楄〃涓嶅啀灞曠ず
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(list, MesProBatchDO::getOwnerUserId));
- Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
- convertSet(list, MesProBatchDO::getItemId));
// 2. 鏋勫缓缁撴灉
- return BeanUtils.toBean(list, MesProBatchRespVO.class, vo -> {
- MapUtils.findAndThen(userMap, vo.getOwnerUserId(), user ->
- vo.setOwnerUserName(user.getNickname()));
- MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
- vo.setItemCode(item.getCode());
- vo.setItemName(item.getName());
- vo.setItemSpecification(item.getSpecification());
- });
- });
+ return BeanUtils.toBean(list, MesProBatchRespVO.class, vo ->
+ MapUtils.findAndThen(userMap, vo.getOwnerUserId(), user ->
+ vo.setOwnerUserName(user.getNickname())));
}
private List<MesProBatchWorkerRespVO> buildWorkerRespVOList(List<MesProBatchWorkerDO> workers) {
--
Gitblit v1.9.3