|
|
@@ -1675,7 +1675,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
a.sales_type salesType, a.channel_id channelId ,a.other
|
|
|
from t_order_new a left join `user` b on a.buyer_id=b.id left join t_order_mid c on a.order_no=c.order_no
|
|
|
left join department dep on a.order_dep=dep.id
|
|
|
- where a.delete_sign in(0,2) and a.process_status >0
|
|
|
+ where a.delete_sign in(0,2) and a.process_status >0 and a.approval in (0,1,2)
|
|
|
<if test="province !=null ">
|
|
|
and dep.province = #{province}
|
|
|
</if>
|
|
|
@@ -1724,7 +1724,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
select count(*)
|
|
|
from t_order_new a left join `user` b on a.buyer_id=b.id left join t_order_mid c on a.order_no=c.order_no
|
|
|
left join department dep on a.order_dep=dep.id
|
|
|
- where a.delete_sign in(0,2) and a.process_status >0
|
|
|
+ where a.delete_sign in(0,2) and a.process_status >0 and a.approval in (0,1,2)
|
|
|
<if test="province !=null ">
|
|
|
and dep.province = #{province}
|
|
|
</if>
|