소스 검색

pms BOM清单列表 设备分类删除 容错

zhangcl 1 개월 전
부모
커밋
28d33a5bd1

+ 6 - 1
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotbom/IotBomController.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.iotbom;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
@@ -133,7 +134,11 @@ public class IotBomController {
         return success(BeanUtils.toBean(list, IotBomRespVO.class, bom -> {
             Integer materialCount = bomMaterialCount.getOrDefault(bom.getId(), 0);
             bom.setMaterials(materialCount);
-            bom.setDeviceCategoryName(deviceCategoryMap.get(bom.getDeviceCategoryId()).getName());
+            if (ObjUtil.isNotEmpty(bom.getDeviceCategoryId())) {
+                if (ObjUtil.isNotEmpty(deviceCategoryMap.get(bom.getDeviceCategoryId()))) {
+                    bom.setDeviceCategoryName(deviceCategoryMap.get(bom.getDeviceCategoryId()).getName());
+                }
+            }
         }));
     }