|
@@ -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);
|
|
|
});
|
|
|
|