Merge remote-tracking branch 'origin/master'

3 months ago · 21d0d73b08
1 changed files with 1 additions and 1 deletions
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
@ -114,6 +114,6 @@
            resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup">
        select bm.* from bus_sales_order_makeup bm
        left join bus_sales_order bo on bo.sid = bm.salesOrderSid
-        where bo.contractNo = #{contractId}
+        where bo.contractNo = #{contractId} and bm.buyTypeKey = '01'
    </select>
 </mapper>