寄存转现货

@@ -254,7 +254,9 @@
     <select id="selectByCondition" resultMap="BaseResultMap" parameterType="com.yoho.order.model.BuyerOrderReq">
         select a.*
         from buyer_order a 
-        <if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.skup != null) or (buyerOrderReq.storageId != null) or (buyerOrderReq.region != null)">
+        <if test="(buyerOrderReq.depotNo != null) or (buyerOrderReq.productId != null) or (buyerOrderReq.skup != null) 
+        or (buyerOrderReq.storageId != null) or (buyerOrderReq.region != null)
+        or (buyerOrderReq.navStatus != null and (buyerOrderReq.navStatus==12 or buyerOrderReq.navStatus==13 or buyerOrderReq.navStatus==14))">
         LEFT JOIN buyer_order_goods b
         ON( b.order_code=a.order_code) 
         LEFT JOIN seller_order_goods c