From 2976e1e20ef35775630a11f9fc7563ab5b6216f0 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 30 十月 2026 19:12:29 +0800
Subject: [PATCH] fix(api): 修复全量接口测试发现的 500 系统异常

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateItemController.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateItemController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateItemController.java
index cdd5397..e1a8ad1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateItemController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateItemController.java
@@ -27,6 +27,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;
@@ -78,6 +80,9 @@
     @PreAuthorize("@ss.hasPermission('mes:qc-template:query')")
     public CommonResult<MesQcTemplateItemRespVO> getTemplateItem(@RequestParam("id") Long id) {
         MesQcTemplateItemDO item = templateItemService.getTemplateItem(id);
+        if (item == null) {
+            return success(null);
+        }
         return success(buildItemRespVOList(Collections.singletonList(item)).get(0));
     }
 
@@ -118,7 +123,12 @@
     // ==================== 鎷兼帴 VO ====================
 
     private List<MesQcTemplateItemRespVO> buildItemRespVOList(List<MesQcTemplateItemDO> list) {
-        if (list.isEmpty()) {
+        // 杩囨护 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();
         }
         // 鎵归噺鏌ヨ鐗╂枡锛坕temId 瀛樼殑鏄� mdm_item_id锛屽叧鑱� mdm_item 琛級

--
Gitblit v1.9.3