瀏覽代碼

基建查用料,三目

qinhouyu 1 年之前
父節點
當前提交
52918be30f

+ 13 - 2
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringMaterialServiceImpl.java

@@ -62,9 +62,20 @@ public class ZEngineeringMaterialServiceImpl implements IZEngineeringMaterialSer
         zEngineeringMaterialVo.stream().forEach(item -> {
             ZEngineeringMaterialBo zEngineeringMaterialBo = BeanUtil.toBean(item, ZEngineeringMaterialBo.class);
             if (StringUtils.isNotEmpty(zEngineeringMaterialBo.getMaterialQuality()))
-                zEngineeringMaterialBo.setMaterialQualityName(izEnginMaterialQualityService.queryById(zEngineeringMaterialBo.getMaterialQuality()).getName());
+                zEngineeringMaterialBo.setMaterialQualityName(
+                    izEnginMaterialQualityService.queryById(zEngineeringMaterialBo.getMaterialQuality())!=null
+                        ?
+                        izEnginMaterialQualityService.queryById(zEngineeringMaterialBo.getMaterialQuality()).getName()
+                        :
+                        zEngineeringMaterialBo.getMaterialQuality());
             if (StringUtils.isNotEmpty(zEngineeringMaterialBo.getSpecifications()))
-                zEngineeringMaterialBo.setSpecificationsName(izEnginSpecificationsService.queryById(zEngineeringMaterialBo.getSpecifications()).getName());
+                zEngineeringMaterialBo.setSpecificationsName(
+                    izEnginSpecificationsService.queryById(zEngineeringMaterialBo.getSpecifications())!=null
+                        ?
+                        izEnginSpecificationsService.queryById(zEngineeringMaterialBo.getSpecifications()).getName()
+                        :
+                        zEngineeringMaterialBo.getSpecifications()
+                );
             zEngineeringMaterialBoList.add(zEngineeringMaterialBo);
         });