From 078c00119879cb72caade7b5228bdd786cccd25c Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 28 Dec 2023 17:25:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=AF=E5=A2=9E=E5=8A=A0=E5=BA=93=E5=AD=98=E5=A4=A7?=
 =?UTF-8?q?=E4=BA=8E0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/book/controller/ShopProductLabelController.java   | 1 +
 .../modules/book/service/impl/ShopProductServiceImpl.java     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java b/src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java
index d48556d0..cab27409 100644
--- a/src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java
+++ b/src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java
@@ -110,6 +110,7 @@ public class ShopProductLabelController {
         shopProductEntityMPJLambdaWrapper.eq(ShopProductToLabelEntity::getSplId,splId);
         shopProductEntityMPJLambdaWrapper.eq(ShopProductToLabelEntity::getDelFlag,0);
         shopProductEntityMPJLambdaWrapper.eq(ShopProduct::getDelFlag,0);
+        shopProductEntityMPJLambdaWrapper.gt(ShopProduct::getProductStock,0);
         Page<ShopProduct> shopProductEntityPage = shopProductToLabelDao.selectJoinPage(new Page<ShopProduct>(page, limit), ShopProduct.class, shopProductEntityMPJLambdaWrapper);
 
         return R.ok().put("page",shopProductEntityPage);
diff --git a/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java
index 0c5f55c3..e61719df 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java
@@ -60,7 +60,9 @@ public class ShopProductServiceImpl extends ServiceImpl<ShopProductDao, ShopProd
         Object name = params.get("name");
         IPage<ShopProduct> page = this.page(
                 new Query<ShopProduct>().getPage(params),
-                new ExcludeEmptyQueryWrapper<ShopProduct>().like("product_name", params.get("key"))
+                new ExcludeEmptyQueryWrapper<ShopProduct>()
+                        .gt("product_stock",0)
+                        .like("product_name", params.get("key"))
         );
         return new PageUtils(page);
     }