|
|
@@ -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},'%')
|