|
|
@@ -936,7 +936,7 @@
|
|
|
select mea.check_no checkNo ,ead.`type`,ead.type_other typeOther,
|
|
|
ead.amount ,ead.real_amount realAmount ,o.contract_no contractNo ,dep.name applyDepName,
|
|
|
a.id sonId,a.type sonType ,a.type_other sonTypeOther ,
|
|
|
- dep2.name payDepName ,a.aname ,ad2.name financeName,mea.status ,mea.process_status processStatus ,mea.id mainId,mea.target_type targetType,
|
|
|
+ dep2.name payDepName ,a.aname ,ad2.name financeName,mea.status ,mea.process_status processStatus ,mea.id mainId,a.target_type targetType,
|
|
|
tm.buyer_name buyerName ,date_format(mea.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr
|
|
|
from expense_account_details ead left join expense_account a on ead.eaid =a.id
|
|
|
left join expense_relationship er on a.id=er.ea_id left join expense_account mea on er.id=mea.id
|
|
|
@@ -952,9 +952,6 @@
|
|
|
<if test=" status != null">
|
|
|
and mea.status = #{status}
|
|
|
</if>
|
|
|
- <if test=" current != null">
|
|
|
- and a.aid= #{current}
|
|
|
- </if>
|
|
|
<if test=" aid != null">
|
|
|
and a.aid= #{aid}
|
|
|
</if>
|
|
|
@@ -965,10 +962,10 @@
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="roleType ==1">
|
|
|
- and dep.expense_finance_id = #{aid}
|
|
|
+ and dep.expense_finance_id = #{current}
|
|
|
</if>
|
|
|
<if test="roleType ==2">
|
|
|
- and dep.expense_finance_id in (select id from admin where superior_id = #{aid})
|
|
|
+ and dep.expense_finance_id in (select id from admin where superior_id = #{current})
|
|
|
</if>
|
|
|
<if test=" contractNo != null">
|
|
|
and o.contract_no like concat('%',#{contractNo},'%')
|