From eee03bbfea8b15d1a56ab63bd09a35c6c861c4cb Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 09 十一月 2026 13:01:08 +0800
Subject: [PATCH] feat(mes): 不合格品处置联动入库与生产订单
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusController.java
index 0f6671c..a32c9f9 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusController.java
@@ -93,11 +93,13 @@
}
// 2. 鎷兼帴鏁版嵁
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
- convertSet(pageResult.getList(), statusType -> Long.parseLong(statusType.getCreator())));
+ convertSet(pageResult.getList(), statusType -> NumberUtils.parseLong(statusType.getCreator())));
Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(
convertSetByFlatMap(pageResult.getList(), CrmBusinessStatusTypeDO::getDeptIds, Collection::stream));
return success(BeanUtils.toBean(pageResult, CrmBusinessStatusRespVO.class, statusTypeVO -> {
- statusTypeVO.setCreator(userMap.get(NumberUtils.parseLong(statusTypeVO.getCreator())).getNickname());
+ // 鍒涘缓浜哄彲鑳藉凡鍒犻櫎锛堝绂昏亴璐﹀彿锛夛紝鏄剧ず鈥滃凡鍒犻櫎鐢ㄦ埛鈥濊�屼笉鏄姏 NPE 瀵艰嚧鏁撮〉鏌ヨ澶辫触
+ AdminUserRespDTO creator = userMap.get(NumberUtils.parseLong(statusTypeVO.getCreator()));
+ statusTypeVO.setCreator(creator != null ? creator.getNickname() : "宸插垹闄ょ敤鎴�");
statusTypeVO.setDeptNames(convertList(statusTypeVO.getDeptIds(),
deptId -> deptMap.containsKey(deptId) ? deptMap.get(deptId).getName() : null));
}));
--
Gitblit v1.9.3