From 4c19b6c9d3a1271f0b6b3f3d8a113e05513afc80 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 14 Oct 2024 16:28:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E9=A4=90=E7=A0=81=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=BAnull=E4=BF=AE=E5=A4=8D?=
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 200f162c..63db3c44 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
@@ -979,7 +979,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             TbOrderInfo orderInfo = orderInfoMapper.selectById(orderId);
             if (orderInfo != null) {
                 JSONObject jsonObject = new JSONObject();
-                if (orderInfo.getMasterId() != null) {
+                if (StrUtil.isNotBlank(orderInfo.getMasterId())) {
                     jsonObject.put("masterId", orderInfo.getMasterId());
                     return jsonObject;
                 }