浏览代码

Merge remote-tracking branch 'origin/master'

zouxuan 4 年之前
父节点
当前提交
9b00ca35f0
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      mec-biz/src/main/resources/config/mybatis/GoodsMapper.xml

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/GoodsMapper.xml

@@ -396,7 +396,7 @@
     <select id="getMusicGroupGoodsAndDiscount" resultMap="MusicGroupGoods">
         SELECT g.* FROM subject_goods_mapper sgm
         LEFT JOIN goods g ON sgm.goods_category_id_ = g.goods_category_id_
-        WHERE sgm.subject_id_ = #{subjectId} and g.status_ != 0
+        WHERE sgm.subject_id_ = #{subjectId} AND g.music_group_show_=1 AND g.status_ != 0
         <if test="type!=null">
             AND g.type_ = #{type}
         </if>