diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java
index 4128c90..d113fb8 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java
@@ -143,7 +143,11 @@ public class TbCallServiceImpl implements TbCallService {
 
     @Override
     public Object getState(String openId, Integer shopId, Integer queueId) {
-        List<CallQueueInfoVO> callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today(), queueId);
+        // 先根据openId查询，查询不到根据queueId
+        List<CallQueueInfoVO> callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today(), null);
+        if (callQueueInfoVOS.isEmpty()) {
+            callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, null, DateUtil.today(), queueId);
+        }
         TbShopInfo shopInfo = shopInfoMapper.selectByPrimaryKey(shopId);
         HashMap<String, Object> data = new HashMap<>();
         data.put("shopInfo", shopInfo);