From 27c58a8d3c102f97264834e9c1a2ed8c34bbb1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 12 Jun 2019 23:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=8C=E4=B8=80=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E4=BA=A7=E7=94=9F=E5=A4=9A=E8=A1=8C=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index 90b8f379..ea80ed71 100644
--- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -42,7 +42,7 @@
     </resultMap>
 
     <select id="selectByConditionDepotHead" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="ResultMapEx">
-        select dh.*, d.name ProjectName, s.supplier OrganName, p.name HandsPersonName, a.name AccountName, dd.name AllocationProjectName
+        select distinct dh.*, d.name ProjectName, s.supplier OrganName, p.name HandsPersonName, a.name AccountName, dd.name AllocationProjectName
         from jsh_depothead dh
         left join jsh_depot d on dh.ProjectId=d.id and ifnull(d.delete_Flag,'0') !='1'
         left join jsh_supplier s on dh.OrganId=s.id and ifnull(s.delete_Flag,'0') !='1'
@@ -81,8 +81,8 @@
     </select>
     <select id="countsByDepotHead" resultType="java.lang.Long">
         SELECT
-        COUNT(jsh_depothead.id)
-        FROM jsh_depothead
+        COUNT(1) from
+        (select distinct jsh_depothead.* FROM jsh_depothead
         inner join jsh_depotitem di on jsh_depothead.Id = di.HeaderId and ifnull(di.delete_Flag,'0') !='1'
         inner join jsh_material m on di.MaterialId = m.Id and ifnull(m.delete_Flag,'0') !='1'
         WHERE 1=1
@@ -107,7 +107,7 @@
         <if test="depotIds != null">
             and di.DepotId in (${depotIds})
         </if>
-        and ifnull(jsh_depothead.delete_Flag,'0') !='1'
+        and ifnull(jsh_depothead.delete_Flag,'0') !='1') tb
     </select>
 
     <select id="getMaxId" resultType="java.lang.Long">