From e2339db8255e350596310ab27bebe5b4a014d5aa Mon Sep 17 00:00:00 2001
From: lead <lead@local>
Date: 星期二, 03 十一月 2026 11:04:36 +0800
Subject: [PATCH] feat(safety): 从长辉分支移植安全生产模块
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java | 10 +++++++++-
1 files changed, 9 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..936e57b 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
@@ -125,6 +125,9 @@
@PreAuthorize("@ss.hasPermission('mes:qc-iqc:query')")
public CommonResult<MesQcIqcRespVO> getIqc(@RequestParam("id") Long id) {
MesQcIqcDO iqc = iqcService.getIqc(id);
+ if (iqc == null) {
+ return success(null);
+ }
return success(buildIqcRespVOList(Collections.singletonList(iqc)).get(0));
}
@@ -251,7 +254,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