|
|
@@ -806,9 +806,9 @@
|
|
|
left join department dep on b.apply_dep =dep.id left join department dep2 on b.pay_dep =dep2.id
|
|
|
left join t_order_new o on b.order_no =o.order_no left join expense_account c on a.ea_id =c.id
|
|
|
left join admin ad on b.aid=ad.id left join department adDep on ad.department_id=adDep.id
|
|
|
- where 1=1 and b.expense_main =1
|
|
|
+ where 1=1 and b.expense_main =1 and b.status < 4
|
|
|
<include refid="ExpenseMainSql"/>
|
|
|
- order by b.status ,b.create_time desc
|
|
|
+ order by if(b.status=3,-1,b.status) ,b.create_time desc
|
|
|
${page_sql}
|
|
|
</select>
|
|
|
<sql id="ExpenseMainSql">
|