|
|
@@ -977,11 +977,13 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="specially == 3">
|
|
|
- and a.order_status=2 and a.process_status in(7)
|
|
|
+ and a.order_status=2
|
|
|
<if test="approval ==0">
|
|
|
+ and a.process_status in(7)
|
|
|
and a.approval = 0
|
|
|
</if>
|
|
|
<if test="approval ==1">
|
|
|
+ and a.process_status in(7)
|
|
|
and a.approval in
|
|
|
<if test="manageType ==0">
|
|
|
(1)
|
|
|
@@ -1134,11 +1136,13 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="specially == 3">
|
|
|
- and a.order_status=2 and a.process_status in(7)
|
|
|
+ and a.order_status=2
|
|
|
<if test="approval ==0">
|
|
|
+ and a.process_status in(7)
|
|
|
and a.approval = 0
|
|
|
</if>
|
|
|
<if test="approval ==1">
|
|
|
+ and a.process_status in(7)
|
|
|
and a.approval in
|
|
|
<if test="manageType ==0">
|
|
|
(1)
|