fix 赠送题库

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/impl/CollectQuestionServiceImpl.java

@@ -51,6 +51,7 @@ public class CollectQuestionServiceImpl extends ServiceImpl<CollectQuestionMappe
         lqw.eq(bo.getQuestionId() != null, CollectQuestion::getQuestionId, bo.getQuestionId());
         lqw.eq(bo.getUserId() != null, CollectQuestion::getUserId, bo.getUserId());
         lqw.eq(bo.getGoodsId() != null, CollectQuestion::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getOrderGoodsId() != null, CollectQuestion::getOrderGoodsId, bo.getOrderGoodsId());
         return this.count(lqw);
     }
 

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -157,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN order_input_template ot ON cb.template_status = ot.id
         WHERE
         1 = 1
+        AND g.goods_type != 5
         <if test="status != null and status.size()!=0 ">
             AND g.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
@@ -280,6 +281,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN order_input_template ot ON cb.template_status = ot.id
         WHERE
         1 = 1
+        AND g.goods_type != 5
         <if test="status != null and status.size()!=0 ">
             AND g.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">