Merge branch 'musicgroup_0806'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderDetailServiceImpl.java

@@ -419,6 +419,10 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
 
     @Override
 	public List<StudentPaymentOrderDetail> getOrderDetail(Long orderId) {
+    	
+    	if(orderId == null){
+    		return new ArrayList<StudentPaymentOrderDetail>();
+    	}
 		
     	List<Long> orderIdList = new ArrayList<Long>();
     	orderIdList.add(orderId);