add 商品列表搜索加上，是否乐器置换搜索

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

@@ -450,9 +450,6 @@
         SELECT g.*
         FROM subject_goods_mapper sgm
         LEFT JOIN goods g ON sgm.goods_category_id_ = g.goods_category_id_
-        WHERE g.replacement_show_ = 1
-        AND g.status_ != 0
-        AND g.type_ = 'INSTRUMENT'
         <include refid="replacementQuerySql"/>
         <include refid="global.limit"/>
     </select>
@@ -461,15 +458,15 @@
         SELECT COUNT(*)
         FROM subject_goods_mapper sgm
         LEFT JOIN goods g ON sgm.goods_category_id_ = g.goods_category_id_
-        WHERE g.replacement_show_ = 1
-        AND g.status_ != 0
-        AND g.type_ = 'INSTRUMENT'
         <include refid="replacementQuerySql"/>
         <include refid="global.limit"/>
     </select>
 
     <sql id="replacementQuerySql">
         <where>
+            g.replacement_show_ = 1
+            AND g.status_ != 0
+            AND g.type_ = 'INSTRUMENT'
             <if test="subjectId != null">
                 AND sgm.subject_id_ = #{subjectId}
             </if>