From 692132be6f4c0cf106b75726b76c415e1a118289 Mon Sep 17 00:00:00 2001
From: dy-hu <dy-hu@haihangyun.com>
Date: Wed, 26 Jun 2024 11:18:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E7=94=BB=E5=B8=83=E9=A6=96=E9=A1=B5=E5=A4=84=E7=90=86=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=B9=B3=E5=8F=B0=E4=B8=8A=E6=9E=B6=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mybatis/mapper/product/CereShopProductDAO.xml  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml b/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml
index 45d723a..10c7eb3 100644
--- a/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml
+++ b/cereshop-app/src/main/resources/mybatis/mapper/product/CereShopProductDAO.xml
@@ -461,7 +461,7 @@
     LEFT JOIN cere_product_classify e ON a.classify_id=e.classify_id
     LEFT JOIN cere_product_classify cpcb ON a.classify_business_id=cpcb.classify_id
     LEFT JOIN (SELECT SUM(number) number,product_id,order_id from cere_order_product GROUP BY product_id) f ON a.product_id=f.product_id
-    where a.shelve_state=1 and d.state=1
+    where d.state=1
     <if test="project!=null and project!='' and project!=0">
       AND d.business_id=#{project}
     </if>
@@ -479,6 +479,12 @@
       OR a.classify_business_id=#{classifyId} OR cpcb.classify_level_hierarchy like concat('%/',#{classifyId},'%')
       )
     </if>
+    <if test="project!=null and project!='' and project!=0">
+      and d.business_id=#{project} and a.shelve_state=1
+    </if>
+    <if test="project==0">
+      AND a.plat_shelve_state=1
+    </if>
     <if test="ids!=null and ids.size()>0">
       and a.product_id in (
       <foreach collection="ids" item="id" index="index" separator=",">