From abeb4155658d23c02e919f011808c67b67051201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 3 Feb 2023 19:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=94=B6=E5=85=A5=E6=94=AF?=
 =?UTF-8?q?=E5=87=BA=E5=8D=95=E5=A6=82=E6=9E=9C=E5=A4=9A=E6=9D=A1=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=EF=BC=8C=E5=88=97=E8=A1=A8=E5=87=BA=E7=8E=B0=E5=A4=9A?=
 =?UTF-8?q?=E6=9D=A1=E9=87=8D=E5=A4=8D=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper_xml/AccountHeadMapperEx.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
index e3db7b87..f98e7d8f 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
@@ -10,7 +10,7 @@
     </resultMap>
 
     <select id="selectByConditionAccountHead" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="ResultMapEx">
-        select ah.*, s.supplier OrganName, p.Name HandsPersonName, u.username userName, a.Name AccountName
+        select distinct ah.*, s.supplier OrganName, p.Name HandsPersonName, u.username userName, a.Name AccountName
         from jsh_account_head ah
         left join jsh_account_item ai on ah.id=ai.header_id and ifnull(ai.delete_flag,'0') !='1'
         left join jsh_depot_head dh on dh.id=ai.bill_id and ifnull(dh.delete_flag,'0') !='1'
@@ -72,8 +72,8 @@
 
     <select id="countsByAccountHead" resultType="java.lang.Long">
         SELECT
-        COUNT(ah.id)
-        FROM jsh_account_head ah
+        COUNT(1) from
+        (select distinct ah.* FROM jsh_account_head ah
         left join jsh_account_item ai on ah.id=ai.header_id and ifnull(ai.delete_flag,'0') !='1'
         left join jsh_depot_head dh on dh.id=ai.bill_id and ifnull(dh.delete_flag,'0') !='1'
         WHERE 1=1
@@ -120,7 +120,7 @@
             <bind name="bindNumber" value="'%'+number+'%'"/>
             and dh.number like #{bindNumber}
         </if>
-        and ifnull(ah.delete_flag,'0') !='1'
+        and ifnull(ah.delete_flag,'0') !='1') tb
     </select>
 
     <select id="findAllMoney" resultType="java.math.BigDecimal">