|
|
@@ -146,10 +146,12 @@
|
|
|
<if test="auditingStatus !=null and auditingStatus != ''">
|
|
|
a.auditing_status=#{auditingStatus}
|
|
|
</if>
|
|
|
+ <if test="auditingStatus !=null and auditingStatus != '' and auditingStatus == 2">
|
|
|
+ and a.approval != 1
|
|
|
+ </if>
|
|
|
<if test="amountStatus !=null and amountStatus != ''">
|
|
|
and a.amount_status=#{amountStatus}
|
|
|
</if>
|
|
|
-
|
|
|
<if test="id !=null and id != ''">
|
|
|
and a.id=#{id}
|
|
|
</if>
|
|
|
@@ -278,7 +280,9 @@
|
|
|
<if test="vo.auditingStatus !=null and vo.auditingStatus != ''">
|
|
|
a.auditing_status=#{vo.auditingStatus}
|
|
|
</if>
|
|
|
-
|
|
|
+ <if test="vo.auditingStatus !=null and vo.auditingStatus != '' and vo.auditingStatus == 2">
|
|
|
+ and a.approval != 1
|
|
|
+ </if>
|
|
|
<if test="vo.amountStatus !=null and vo.amountStatus != ''">
|
|
|
and a.amount_status=#{vo.amountStatus}
|
|
|
</if>
|
