diff --git a/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml index 920292a5..3b4ab24f 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml @@ -82,12 +82,11 @@ and dh.account_id=#{accountId} and ifnull(dh.delete_flag,'0') !='1' - UNION ALL select ah.bill_no,ah.type as newType, 'financial' as fromType, s.supplier,ah.change_amount,date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList from jsh_account_head ah left join jsh_supplier s on ah.organ_id=s.id and ifnull(s.delete_flag,'0') !='1' - where 1=1 + where ah.type!='转账' and ah.account_id=#{accountId} @@ -152,7 +151,7 @@ UNION ALL select count(1) a from jsh_account_head ah left join jsh_supplier s on ah.organ_id=s.id and ifnull(s.delete_flag,'0') !='1' - where 1=1 + where ah.type!='转账' and ah.account_id=#{accountId}