diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopSongOrderServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopSongOrderServiceImpl.java index f13d47fc..39e0d3d6 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopSongOrderServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopSongOrderServiceImpl.java @@ -63,8 +63,9 @@ public class TbShopSongOrderServiceImpl extends ServiceImpl byState = tbShopSongOrderMapper.findByState(2, shopId); if(CollectionUtils.isEmpty(byState)){ map.put("afoot","");//演唱中 + }else { + map.put("afoot",byState.get(0));//演唱中 } - map.put("afoot",byState.get(0));//演唱中 map.put("Waiting",tbShopSongOrderMapper.findByState(1,shopId)); return map; }