From c4a7ecd7175806ac2165c2910197f42d2dd0850a Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 26 Sep 2024 16:40:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/ProductService.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index 8df6bc1..36d11f8 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -145,7 +145,7 @@ public class ProductService {
             tbShopTable.setChoseCount(order != null && (order.getSeatCount() != null));
         }
 
-        concurrentMap.put("shopTableInfo", tbShopTable);
+        concurrentMap.put("shopTableInfo", tbShopTable == null ? "" : tbShopTable);
         concurrentMap.put("storeInfo", shopInfo);
         concurrentMap.put("distance", distance);
         TbShopUser shopUser = tbShopUserMapper.selectByUserIdAndShopId(userId, shopId != null ? shopId.toString() : tbShopTable.getShopId().toString());