he2802 3 роки тому
батько
коміт
d9366b9fe1

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cgu.learn_status,
         cgu.official_status,
         cg.class_status,
-        m.category_name,
+        m.category_name
         FROM
         order_goods og
         LEFT JOIN class_grade cg on og.grade_id = cg.grade_id

+ 3 - 0
zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -129,6 +129,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="goodsId != null and goodsId != '' ">
             and us.goods_id = #{goodsId}
         </if>
+        <if test="orderGoodsId != null and orderGoodsId != '' ">
+            and us.order_goods_id = #{orderGoodsId}
+        </if>
         <if test="result != null ">
             and us.result = #{result}
         </if>