|
@@ -88,10 +88,13 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
|
|
|
|
|
|
//乐团乐器及辅件信息
|
|
|
List<MusicGroupSubjectGoodsGroup> goodsGroups = musicGroupSubjectGoodsGroupService.findGoodsGroup(musicGroupId, subjectId);
|
|
|
+
|
|
|
+ List<Goods> accessoriesList = goodsService.findGoodsBySubId(subjectId,GoodsType.ACCESSORIES.getCode());
|
|
|
+
|
|
|
goodsGroups.forEach(goodsGroup -> {
|
|
|
if (goodsGroup.getType().equals(GoodsType.INSTRUMENT)) {
|
|
|
goodsGroup.getGoodsList().forEach(goods -> {
|
|
|
- goods.setGoodsList(goodsService.findGoodsBySubId(subjectId,GoodsType.ACCESSORIES.getCode()));
|
|
|
+ goods.setGoodsList(accessoriesList);
|
|
|
});
|
|
|
}
|
|
|
});
|