|
|
@@ -856,7 +856,7 @@
|
|
|
from t_order_new o
|
|
|
left join `user` u on o.buyer_id = u.id
|
|
|
left join admin a on o.salesman_id = a.id
|
|
|
- where delete_sign = 0 and approval = 2 and finance_id is null
|
|
|
+ where delete_sign = 0 and approval = 2 and finance_id is null and order_status = 2
|
|
|
<if test='o.orderNo != null and o.orderNo != ""'>
|
|
|
and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
@@ -918,7 +918,7 @@
|
|
|
from t_order_new o
|
|
|
left join `user` u on o.buyer_id = u.id
|
|
|
left join admin a on o.salesman_id = a.id
|
|
|
- where delete_sign = 0 and approval = 2 and finance_id is null
|
|
|
+ where delete_sign = 0 and approval = 2 and finance_id is null and order_status = 2
|
|
|
<if test='o.orderNo != null and o.orderNo != ""'>
|
|
|
and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|