From 6de15528a3ba8f9c87d9aaffe895e69fdcdc9026 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 16 十月 2026 21:28:43 +0800
Subject: [PATCH] fix(system): 修复用户导入「覆盖」分支不可达,导入测试对齐新模板列
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
index 3393b6e..7c4e565 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
@@ -251,7 +251,12 @@
// 鎷艰 VO
return BeanUtils.toBean(list, MesQcIqcRespVO.class, vo -> {
findAndThen(vendorMap, vo.getVendorId(),
- vendor -> vo.setVendorNickname(vendor.getName()));
+ vendor -> {
+ if (vo.getVendorName() == null) {
+ vo.setVendorName(vendor.getName());
+ }
+ });
+ vo.setVendorNickname(vo.getVendorName());
findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode());
vo.setItemName(item.getName());
--
Gitblit v1.9.3