From bab3941807e4b84bc8dc25c8b3535be6a2179a41 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Tue, 9 Jan 2024 15:30:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E4=B9=A6=E7=B1=BB=E5=9E=8B=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A8=E9=83=A8=E9=80=89=E6=8B=A9=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../book/controller/ShopProductLabelController.java       | 8 +++++++-
 1 file changed, 7 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 9e4ad68c..3848bd4c 100644
--- a/src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java
+++ b/src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java
@@ -115,7 +115,13 @@ public class ShopProductLabelController {
         if (type!=null){
             wrapper.leftJoin(MedicaldesBook.class, MedicaldesBook::getBookId,ShopProduct::getBookId);
             wrapper.inSql(ShopProduct::getProductId,"select product_id from shop_product where book_Ids not like \"%,%\"");
-            wrapper.eq(MedicaldesBook::getTypeId,type);
+            if(type==0){//0为医学图书全部
+                wrapper.in(MedicaldesBook::getTypeId,1,2,3,4);
+            }else if (type == -1) {//-1为文哲图书全部
+                wrapper.in(MedicaldesBook::getTypeId,5,6);
+            }else {
+                wrapper.eq(MedicaldesBook::getTypeId,type);
+            }
         }
         Page<ShopProduct> shopProductEntityPage = shopProductToLabelDao.selectJoinPage(new Page<ShopProduct>(page, limit),
                 ShopProduct.class, wrapper);