From 8ef801afa1a32892548dcd81e4bd7ea4515bb377 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Wed, 30 Oct 2024 16:00:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/service/impl/shopimpl/TbShopTableServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 33df018a..61752900 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -780,7 +780,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
         if (!shopEatTypeInfoDTO.isTakeout()) {
             if (StrUtil.isBlank(tableId)) {
-                queryWrapper.isNull(TbCashierCart::getTableId);
+                queryWrapper.and(q -> q.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""));
             } else {
                 queryWrapper.eq(TbCashierCart::getTableId, tableId);
             }