--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/articlelibrary/ArticleLibrarySerivceImpl.java

@@ -158,10 +158,12 @@ public class ArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,In
 			SaveResourceForm form =new  SaveResourceForm();
 			BeanUtils.copyProperties(entity,form);
 			articleGoodsService.createCriteria().andEqualTo("objectId" , entity.getId());
-			ArticleGoods  goods= articleGoodsService.selectOneByCriteria();
-			if(goods.getSellingPrice()!=null){
-				form.setSellingPrice(goods.getSellingPrice());
-				form.setPriceType(goods.getPriceType());
+			ArticleGoods goods= articleGoodsService.selectOneByCriteria();
+			if(goods!=null){
+				if(goods.getSellingPrice()!=null){
+					form.setSellingPrice(goods.getSellingPrice());
+					form.setPriceType(goods.getPriceType());
+				}
 			}
 			binService.saveResource(form);
 		}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioLibrarySerivceImpl.java

@@ -220,9 +220,11 @@ public class AudioLibrarySerivceImpl extends BaseServiceImpl<AudioLibrary,Intege
 			BeanUtils.copyProperties(entity,form);
 			audioGoodsService.createCriteria().andEqualTo("objectId" , entity.getId());
 			AudioGoods goods = audioGoodsService.selectOneByCriteria();
-			if(goods.getSellingPrice()!=null){
-				form.setSellingPrice(goods.getSellingPrice());
-				form.setPriceType(goods.getPriceType());
+			if(goods!=null){
+				if(goods.getSellingPrice()!=null){
+					form.setSellingPrice(goods.getSellingPrice());
+					form.setPriceType(goods.getPriceType());
+				}
 			}
 			binService.saveResource(form);
 		}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/coursewarelibrary/CoursewareLibrarySerivceImpl.java

@@ -216,9 +216,11 @@ public class CoursewareLibrarySerivceImpl extends BaseServiceImpl<CoursewareLibr
 			BeanUtils.copyProperties(entity,form);
 			coursewareGoodsService.createCriteria().andEqualTo("objectId" , entity.getId());
 			CoursewareGoods goods = coursewareGoodsService.selectOneByCriteria();
-			if(goods.getSellingPrice()!=null){
-				form.setSellingPrice(goods.getSellingPrice());
-				form.setPriceType(goods.getPriceType());
+			if(goods!=null){
+				if(goods.getSellingPrice()!=null){
+					form.setSellingPrice(goods.getSellingPrice());
+					form.setPriceType(goods.getPriceType());
+				}
 			}
 			binService.saveResource(form);
 		}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/BookServiceImpl.java

@@ -55,9 +55,11 @@ public class BookServiceImpl extends BaseServiceImpl<Book, String> implements
 			BeanUtils.copyProperties(entity, form);
 			bookGoodsService.createCriteria().andEqualTo("objectId", entity.getId());
 			BookGoods goods = bookGoodsService.selectOneByCriteria();
-			if(goods.getSellingPrice()!=null){
-				form.setSellingPrice(goods.getSellingPrice());
-				form.setPriceType(goods.getPriceType());
+			if(goods!=null){
+				if(goods.getSellingPrice()!=null){
+					form.setSellingPrice(goods.getSellingPrice());
+					form.setPriceType(goods.getPriceType());
+				}
 			}
 			binService.saveResource(form);
 		}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/imagelibrary/ImageLibrarySerivceImpl.java

@@ -240,9 +240,11 @@ public class ImageLibrarySerivceImpl extends BaseServiceImpl<ImageLibrary,Intege
 			BeanUtils.copyProperties(entity,form);
 			imageGoodsService.createCriteria().andEqualTo("objectId" , entity.getId());
 			ImageGoods goods = imageGoodsService.selectOneByCriteria();
-			if(goods.getSellingPrice()!=null){
-				form.setSellingPrice(goods.getSellingPrice());
-				form.setPriceType(goods.getPriceType());
+			if(goods!=null){
+				if(goods.getSellingPrice()!=null){
+					form.setSellingPrice(goods.getSellingPrice());
+					form.setPriceType(goods.getPriceType());
+				}
 			}
 			binService.saveResource(form);
 		}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/pdffilelibrary/PdfLibrarySerivceImpl.java

@@ -244,9 +244,11 @@ public class PdfLibrarySerivceImpl extends BaseServiceImpl<PdfLibrary,Integer> i
 			BeanUtils.copyProperties(entity,form);
 			pdfLibrarySerivce.createCriteria().andEqualTo("objectId" , entity.getId());
 			PdfGoods goods = pdfLibrarySerivce.selectOneByCriteria();
-			if(goods.getSellingPrice()!=null){
-				form.setSellingPrice(goods.getSellingPrice());
-				form.setPriceType(goods.getPriceType());
+			if(goods!=null){
+				if(goods.getSellingPrice()!=null){
+					form.setSellingPrice(goods.getSellingPrice());
+					form.setPriceType(goods.getPriceType());
+				}
 			}
 			binService.saveResource(form);
 		}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibrarySerivceImpl.java

@@ -244,9 +244,11 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,Intege
 			BeanUtils.copyProperties(entity,form);
 			videoGoodsService.createCriteria().andEqualTo("objectId" , entity.getId());
 			VideoGoods goods = videoGoodsService.selectOneByCriteria();
-			if(goods.getSellingPrice()!=null){
-				form.setSellingPrice(goods.getSellingPrice());
-				form.setPriceType(goods.getPriceType());
+			if(goods!=null){
+				if(goods.getSellingPrice()!=null){
+					form.setSellingPrice(goods.getSellingPrice());
+					form.setPriceType(goods.getPriceType());
+				}
 			}
 			binService.saveResource(form);
 		}