From da458e9debefd0f88e9e9427c8d174aae20dd022 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:10:15 +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

---
 erp_web/pages/manage/account.html                 | 2 +-
 src/main/resources/mapper_xml/AccountMapperEx.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/erp_web/pages/manage/account.html b/erp_web/pages/manage/account.html
index 0720eff3..70549afe 100644
--- a/erp_web/pages/manage/account.html
+++ b/erp_web/pages/manage/account.html
@@ -614,7 +614,7 @@
                     }
                 },
                 {title: '余额', field: 'balance', width: 80},
-                {title: '入库出库日期', field: 'operTime', width: 180}
+                {title: '单据日期', field: 'operTime', width: 180}
             ]],
             onLoadError: function () {
                 $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
diff --git a/src/main/resources/mapper_xml/AccountMapperEx.xml b/src/main/resources/mapper_xml/AccountMapperEx.xml
index d2ed1259..d6fc3034 100644
--- a/src/main/resources/mapper_xml/AccountMapperEx.xml
+++ b/src/main/resources/mapper_xml/AccountMapperEx.xml
@@ -54,7 +54,7 @@
     <select id="findAccountInOutList" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="ResultInOutList">
         <!--主表出入库涉及的账户 -->
         select dh.Number,concat(dh.SubType,dh.Type) as newType,s.supplier,dh.ChangeAmount,date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
-        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}
@@ -64,7 +64,7 @@
         <!--主表收入和支出涉及的账户 -->
         UNION ALL
         select ah.BillNo,ah.Type as newType,s.supplier,ah.ChangeAmount,date_format(ah.BillTime,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
-        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}
@@ -73,7 +73,7 @@
         <!--明细中涉及的账户（收款,付款,收预付款） -->
         UNION ALL
         select ah.BillNo,ah.Type as newType,s.supplier,ai.EachAmount,date_format(ah.BillTime,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
-        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">
@@ -102,7 +102,7 @@
         UNION ALL
         select dh.Number,concat(dh.SubType,dh.Type) as newType,s.supplier,dh.ChangeAmount,date_format(dh.OperTime,'%Y-%m-%d %H:%i:%S') as oTime,
         dh.AccountIdList as AList,dh.AccountMoneyList as AMList
-        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}%'