|
|
@@ -477,7 +477,7 @@
|
|
|
</if>
|
|
|
<if test="expenseMain ==1">
|
|
|
left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
|
|
|
- <if test="contractNo !=null">
|
|
|
+ <if test="contractNo !=null or username !=null">
|
|
|
left join expense_relationship er on a.id=er.id
|
|
|
left join expense_account sea on er.ea_id=sea.id
|
|
|
left join t_order_new e on sea.order_no =e.order_no
|
|
|
@@ -597,7 +597,7 @@
|
|
|
</if>
|
|
|
<if test="expenseMain ==1">
|
|
|
left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
|
|
|
- <if test="contractNo !=null">
|
|
|
+ <if test="contractNo !=null or username !=null">
|
|
|
left join expense_relationship er on a.id=er.id
|
|
|
left join expense_account sea on er.ea_id=sea.id
|
|
|
left join t_order_new e on sea.order_no =e.order_no
|
|
|
@@ -631,7 +631,7 @@
|
|
|
</if>
|
|
|
<if test="expenseMain ==1">
|
|
|
left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
|
|
|
- <if test="contractNo !=null">
|
|
|
+ <if test="contractNo !=null or username !=null">
|
|
|
left join expense_relationship er on a.id=er.id
|
|
|
left join expense_account sea on er.ea_id=sea.id
|
|
|
left join t_order_new e on sea.order_no =e.order_no
|