111111

ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/EntryBillMapper.xml

@@ -228,7 +228,7 @@
         left join t_entry_bill b on a.id=b.income_id
         left join t_entry_bill_flow c on c.entry_id=b.id
         and c.entry_type='到款转暂存'
-        left join t_voucher d on d.id=c.voucher_id
+        left join t_voucher d on d.id=c.voucher_id and d.voucher_state!='驳回'
         left join t_bank_account_number e on e.bank_number=a.income_account and e.available='Yes'
 
         <where>
@@ -240,7 +240,7 @@
                 and a.income_account=#{qry.incomeAccount}
             </if>
             <if test="qry.voucherState !=null and qry.voucherState.contains('待处理') ">
-                and c.id is null
+                and d.id is null
             </if>
             <if test="qry.voucherState !=null and qry.voucherState.contains('申请中') ">
                 and d.voucher_state='申请中'