From 295b1e5602b2b2d34d97de203f5c43aac2adbb55 Mon Sep 17 00:00:00 2001
From: dy-hu <dy-hu@haihangyun.com>
Date: Thu, 27 Jun 2024 11:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=90=9C=E7=B4=A2=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=B9=B3=E5=8F=B0=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/mapper/product/CereProductClassifyDAO.xml    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cereshop-app/src/main/resources/mybatis/mapper/product/CereProductClassifyDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/product/CereProductClassifyDAO.xml
index 6e34b34..7636d1c 100644
--- a/cereshop-app/src/main/resources/mybatis/mapper/product/CereProductClassifyDAO.xml
+++ b/cereshop-app/src/main/resources/mybatis/mapper/product/CereProductClassifyDAO.xml
@@ -206,7 +206,7 @@
     INNER JOIN cere_platform_shop d ON a.shop_id=d.shop_id
     INNER JOIN cere_product_classify e ON a.classify_id=e.classify_id OR a.classify_business_id=e.classify_id
     LEFT JOIN (SELECT SUM(number) number,sku_id,order_id from cere_order_product GROUP BY sku_id) f ON b.sku_id=f.sku_id
-    where a.shelve_state=1 and d.state=1
+    where d.state=1
     <if test="classifyId!=null">
       and (a.classify_id=#{classifyId} OR e.classify_level_hierarchy like concat('%/',#{classifyId},'%') OR a.classify_business_id=#{classifyId})
     </if>
@@ -214,7 +214,10 @@
       and a.product_name like concat('%',#{productName},'%')
     </if>
     <if test='project !=null and project !="" and project != "0"'>
-      and  d.business_id = #{project}
+      and  d.business_id = #{project} and a.shelve_state=1
+    </if>
+    <if test="project==0">
+      AND a.plat_shelve_state=1
     </if>
 
     ORDER BY