Merge branch 'master-order' into dev

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityProductBiz.java

@@ -48,8 +48,10 @@ public class ActivityProductBiz extends BaseBiz<ActivityProductMapper, ActivityP
 		Example example = new Example(ActivityProduct.class);
 		example.createCriteria().andEqualTo("id", id).andEqualTo("isDel", false);
 		ActivityProduct activityProduct = mapper.selectOneByExample(example);
+		if(activityProduct != null) {
 			List<ActivityProductSpecs> activityProductSpecs = activityProductSpecsBiz.getAllByActiveId(activityProduct.getId());
 			activityProduct.setList(activityProductSpecs);
+		}
 		return activityProduct;
 	}