|
|
@@ -833,10 +833,8 @@
|
|
|
from expense_relationship a
|
|
|
left join expense_account b on a.id =b.id
|
|
|
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
|
|
|
+ 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
|
|
|
<if test=" status != null">
|
|
|
and b.status = #{status}
|