From 37e8ba46879a6094938ad685b1054eb6446ae749 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 五月 2020 19:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/share/UserShareGoodsGroupMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/share/UserShareGoodsGroupMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/share/UserShareGoodsGroupMapper.xml
index b7f90cf..feaf9b5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/share/UserShareGoodsGroupMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/share/UserShareGoodsGroupMapper.xml
@@ -138,7 +138,8 @@
    <select id="listByRecordId" resultMap="BaseResultMap">
 	 SELECT * FROM yeshi_ec_share_goods_group  tg
 	 LEFT JOIN  `yeshi_ec_common_goods` cg ON tg.`gu_common_goods_id` = cg.`cg_id`
-	 WHERE tg.`gu_record_id` = #{recordId}
+	 WHERE tg.`gu_record_id` = #{recordId} 
+	 <if test="notBackSuVip == true"><![CDATA[AND cg.`cg_goods_type` <> 4 AND cg.`cg_goods_type` <> 5]]></if>
 	 ORDER BY tg.`gu_createtime`
    </select>
     

--
Gitblit v1.8.0