--no commit message

com.zrqx.bg.resource/src/main/java/com/zrqx/bg/resource/manage/label/LabelManage.java

@@ -58,7 +58,7 @@ public class LabelManage {
 		List<LabelGoodsRelation> labelGoodsRelation = labelGoodsRelationMapper.select(record);
 		Map<Integer, String> labelNames = new HashMap<Integer, String>(); 
 		labelGoodsRelation.stream().map(LabelGoodsRelation :: getLabelId)
-					.map(id -> labelNames.put(id, getName(id, new StringBuffer())));
+					.forEach(id -> labelNames.put(id, getName(id, new StringBuffer())));
 		return labelNames;
 	}
 

com.zrqx.bg.resource/src/main/java/com/zrqx/bg/resource/service/goods/phyresource/PhyResourceServiceImpl.java

@@ -267,6 +267,7 @@ public class PhyResourceServiceImpl extends BaseModelServiceImpl<PhyResource, St
 	@Override
 	public PhyResourceVo get(String id) {
 		PhyResource phyResource = phyResourceMapper.selectByPrimaryKey(id);
+		if(phyResource == null) throw new BusinessValidateException("不存在该资源	");
 		PhyResourceVo phyResourceVo = new PhyResourceVo();
 		try {
 			BeanUtils.copyProperties(phyResource, phyResourceVo);