|
|
@@ -1698,11 +1698,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
and a.approval = 0
|
|
|
</if>
|
|
|
<if test="approval ==1">
|
|
|
- and a.process_status = 7
|
|
|
- and a.approval = 1
|
|
|
- </if>
|
|
|
- <if test="approval ==2">
|
|
|
- and a.approval > 1
|
|
|
+ and a.approval in (1,2)
|
|
|
</if>
|
|
|
<if test="amountStatus == 0">
|
|
|
and a.total_amount < 10
|
|
|
@@ -1751,11 +1747,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
and a.approval = 0
|
|
|
</if>
|
|
|
<if test="approval ==1">
|
|
|
- and a.process_status = 7
|
|
|
- and a.approval = 1
|
|
|
- </if>
|
|
|
- <if test="approval ==2">
|
|
|
- and a.approval > 1
|
|
|
+ and a.approval in (1,2)
|
|
|
</if>
|
|
|
<if test="amountStatus == 0">
|
|
|
and a.total_amount < 10
|