From e40a608ef9bf51db294d8eefada6a8e2e80cebca Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 15 十月 2026 16:03:27 +0800
Subject: [PATCH] fix(mdm): 物料列表改按物料编码排序
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java
index 332d12d..4b630ad 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java
@@ -116,14 +116,21 @@
// 1. 鎵归噺鑾峰彇鍏宠仈鏁版嵁
Map<Long, MesDvMeteringDO> meteringMap = meteringService.getMeteringMap(
convertSet(list, MesDvMeteringCheckDO::getMeteringId));
- Map<Long, AdminUserRespDTO> userMap = CollUtil.isNotEmpty(convertSet(list, MesDvMeteringCheckDO::getCheckUserId))
- ? adminUserApi.getUserMap(convertSet(list, MesDvMeteringCheckDO::getCheckUserId)) : Collections.emptyMap();
+ var legacyUserIds = list.stream()
+ .filter(check -> cn.hutool.core.util.StrUtil.isBlank(check.getCheckUserName()))
+ .map(MesDvMeteringCheckDO::getCheckUserId).filter(java.util.Objects::nonNull)
+ .collect(java.util.stream.Collectors.toSet());
+ Map<Long, AdminUserRespDTO> userMap = legacyUserIds.isEmpty()
+ ? Collections.emptyMap() : adminUserApi.getUserMap(legacyUserIds);
// 2. 鎷兼帴 VO
return BeanUtils.toBean(list, MesDvMeteringCheckRespVO.class, vo -> {
MapUtils.findAndThen(meteringMap, vo.getMeteringId(),
metering -> vo.setMeteringCode(metering.getCode()).setMeteringName(metering.getName()));
- MapUtils.findAndThen(userMap, vo.getCheckUserId(),
- user -> vo.setCheckUserNickname(user.getNickname()));
+ if (cn.hutool.core.util.StrUtil.isBlank(vo.getCheckUserName())) {
+ MapUtils.findAndThen(userMap, vo.getCheckUserId(),
+ user -> vo.setCheckUserName(user.getNickname()));
+ }
+ vo.setCheckUserNickname(vo.getCheckUserName());
});
}
--
Gitblit v1.9.3