声部关联商品，过滤删除的分类

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

@@ -450,6 +450,7 @@
         SELECT g.id_,g.brand_,g.specification_,g.brief_ param_,g.market_price_,g.discount_price_,g.group_purchase_price_ sale_price_,
         (g.discount_price_-g.group_purchase_price_) depreciation_price_
         FROM subject_goods_mapper sgm
+        LEFT JOIN goods_category gc ON gc.id_=sgm.goods_category_id_
         LEFT JOIN goods g ON sgm.goods_category_id_ = g.goods_category_id_
         <include refid="replacementQuerySql"/>
         <include refid="global.limit"/>
@@ -458,6 +459,7 @@
     <select id="getReplacementInstrumentCount" resultType="int">
         SELECT COUNT(*)
         FROM subject_goods_mapper sgm
+        LEFT JOIN goods_category gc ON gc.id_=sgm.goods_category_id_
         LEFT JOIN goods g ON sgm.goods_category_id_ = g.goods_category_id_
         <include refid="replacementQuerySql"/>
         <include refid="global.limit"/>
@@ -468,6 +470,7 @@
             g.replacement_show_ = 1
             AND g.status_ != 0
             AND g.type_ = 'INSTRUMENT'
+            AND gc.del_flag_ = 0
             <if test="subjectId != null">
                 AND sgm.subject_id_ = #{subjectId}
             </if>