From 8a1ea045961fbd80907b459c22bad8e1463843a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 16 Dec 2021 23:10:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=B4=A6=E6=88=B7=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E8=AE=B0=E5=BD=95=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper_xml/AccountMapperEx.xml        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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}
         </if>
         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!='转账'
         <if test="accountId != null">
             and ah.account_id=#{accountId}
         </if>
@@ -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!='转账'
             <if test="accountId != null">
                 and ah.account_id=#{accountId}
             </if>