|
@@ -246,7 +246,7 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
|
|
|
courseViewType = courseViewType == 3?2:courseViewType;
|
|
|
organId = musicGroup.getOrganId();
|
|
|
}
|
|
|
- List<MusicGroupGoodsAndDiscountDto> goodsList = goodsDao.getMusicGroupGoodsAndDiscount(subjectId, type, courseViewType);
|
|
|
+ List<MusicGroupGoodsAndDiscountDto> goodsList = goodsDao.getMusicGroupGoodsAndDiscount(subjectId, type, courseViewType,organId);
|
|
|
if (chargeTypeId == null || (type != null && !"INSTRUMENT".equals(type))) {
|
|
|
return goodsList;
|
|
|
}
|