|
@@ -189,12 +189,15 @@ public class TournamentsServiceImpl implements ITournamentsService {
|
|
|
i++;
|
|
i++;
|
|
|
//奖品
|
|
//奖品
|
|
|
PrizeDistributionItemsVo prizeDistributionItemsVos = prizeDistributionItemsMapper.selectByPrizeDistributionId(id2);
|
|
PrizeDistributionItemsVo prizeDistributionItemsVos = prizeDistributionItemsMapper.selectByPrizeDistributionId(id2);
|
|
|
- ItemsPrizeDto itemsPrizeBo = new ItemsPrizeDto();
|
|
|
|
|
- itemsPrizeBo.setRanking(Long.valueOf(i));
|
|
|
|
|
- itemsPrizeBo.setItemId(prizeDistributionItemsVos.getItemId());
|
|
|
|
|
- itemsPrizeBo.setQuantity(prizeDistributionItemsVos.getQuantity());
|
|
|
|
|
- itemsPrizeBo.setItemsName(prizeDistributionItemsVos.getItemsName());
|
|
|
|
|
- itemsPrizeList.add(itemsPrizeBo);
|
|
|
|
|
|
|
+ if(prizeDistributionItemsVos!=null){
|
|
|
|
|
+ ItemsPrizeDto itemsPrizeBo = new ItemsPrizeDto();
|
|
|
|
|
+ itemsPrizeBo.setRanking(Long.valueOf(i));
|
|
|
|
|
+ itemsPrizeBo.setItemId(prizeDistributionItemsVos.getItemId());
|
|
|
|
|
+ itemsPrizeBo.setQuantity(prizeDistributionItemsVos.getQuantity());
|
|
|
|
|
+ itemsPrizeBo.setItemsName(prizeDistributionItemsVos.getItemsName());
|
|
|
|
|
+ itemsPrizeList.add(itemsPrizeBo);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
record.setItemsPrizeList(itemsPrizeList);
|
|
record.setItemsPrizeList(itemsPrizeList);
|
|
|
}
|
|
}
|