|
|
@@ -884,7 +884,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
and a.outsource= #{outsource,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
<if test="specially == 0">
|
|
|
- and a.order_status not in(3,5,6,7) and a.approval !=3
|
|
|
+ and a.order_status not in(3,5,6,7) and a.approval in(0,1,2)
|
|
|
and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="specially == 1">
|
|
|
@@ -1014,7 +1014,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
and a.outsource= #{outsource,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
<if test="specially == 0">
|
|
|
- and a.order_status not in(3,5,6,7) and a.approval !=3
|
|
|
+ and a.order_status not in(3,5,6,7) and a.approval in(0,1,2)
|
|
|
and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="specially == 1">
|