From f5d1af39c32aeb932d88662932724e4aa8f25ca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 10 May 2020 12:12:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=93=E7=AE=97=E8=B4=A6?=
 =?UTF-8?q?=E6=88=B7=E6=B5=81=E6=B0=B4=E9=87=8C=E9=9D=A2=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=E9=9B=B6=E5=94=AE=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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper_xml/AccountMapperEx.xml b/src/main/resources/mapper_xml/AccountMapperEx.xml
index d6fc3034..ef1d2e75 100644
--- a/src/main/resources/mapper_xml/AccountMapperEx.xml
+++ b/src/main/resources/mapper_xml/AccountMapperEx.xml
@@ -119,7 +119,7 @@
         (
             <!--主表出入库涉及的账户 -->
             select count(1) a
-            from jsh_depothead dh inner join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
+            from jsh_depothead dh left join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
             where 1=1
             <if test="accountId != null">
                 and dh.AccountId=${accountId}
@@ -128,7 +128,7 @@
             <!--主表收入和支出涉及的账户 -->
             UNION ALL
             select count(1) a
-            from jsh_accounthead ah inner join jsh_supplier s on ah.OrganId=s.id and ifnull(s.delete_Flag,'0') !='1'
+            from jsh_accounthead ah left join jsh_supplier s on ah.OrganId=s.id and ifnull(s.delete_Flag,'0') !='1'
             where 1=1
             <if test="accountId != null">
                 and ah.AccountId=${accountId}
@@ -137,7 +137,7 @@
             <!--明细中涉及的账户（收款,付款,收预付款） -->
             UNION ALL
             select count(1) a
-            from jsh_accounthead ah inner join jsh_supplier s on ah.OrganId=s.id
+            from jsh_accounthead ah left join jsh_supplier s on ah.OrganId=s.id
             inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
             where ah.Type in ('收款','付款','收预付款')
             <if test="accountId != null">
@@ -165,7 +165,7 @@
             <!--多账户的情况 -->
             UNION ALL
             select count(1) a
-            from jsh_depothead dh inner join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
+            from jsh_depothead dh left join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
             where 1=1
             <if test="accountId != null">
                 and dh.AccountIdList like '%${accountId}%'