From 25bdb3fa20edd3b09611ccd5d19244d4e7264ab0 Mon Sep 17 00:00:00 2001
From: lead <lead@local>
Date: 星期二, 03 十一月 2026 10:09:31 +0800
Subject: [PATCH] fix(kyzn): 物料新增 500 —— 修复 MES 物料分类编码重复导致 selectOne 抛 TooManyResultsException
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateIndicatorController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateIndicatorController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateIndicatorController.java
index 0d2e747..fa14ebd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateIndicatorController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateIndicatorController.java
@@ -24,6 +24,8 @@
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -73,6 +75,9 @@
@PreAuthorize("@ss.hasPermission('mes:qc-template:query')")
public CommonResult<MesQcTemplateIndicatorRespVO> getTemplateIndicator(@RequestParam("id") Long id) {
MesQcTemplateIndicatorDO indicator = templateIndicatorService.getTemplateIndicator(id);
+ if (indicator == null) {
+ return success(null);
+ }
return success(buildIndicatorRespVOList(Collections.singletonList(indicator)).get(0));
}
@@ -88,6 +93,11 @@
// ==================== 鎷兼帴 VO ====================
private List<MesQcTemplateIndicatorRespVO> buildIndicatorRespVOList(List<MesQcTemplateIndicatorDO> list) {
+ // 杩囨护 null 鍏冪礌锛氬崟鏉� get 鏌ヤ笉鍒版椂浼犲叆鐨勬槸 [null]锛屽惁鍒� convertSet 浼� NPE
+ if (CollUtil.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+ list = list.stream().filter(Objects::nonNull).collect(Collectors.toList());
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
}
--
Gitblit v1.9.3