From ae4f19ec2145369fb8e53722f0581c3bc05062a3 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期五, 06 九月 2024 16:29:33 +0800
Subject: [PATCH] Merge branch 'master' into master-v2
---
src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml b/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
index 69ef777..60a976a 100644
--- a/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
@@ -16,7 +16,7 @@
join t_flower_markup_sp sp on sp.flower_id = f.id and sp.partner_id = #{partnerId}
left join t_supplier_info s on s.id = f.supplier_id
left join t_flower_category c on f.category = c.id
- WHERE f.deleted = 0
+ WHERE f.deleted = 0 AND sp.fee > 0
<if test="condition.name != null and condition.name != ''">
AND f.name LIKE concat('%', #{condition.name},'%')
</if>
--
Gitblit v1.9.3