From 0f1f5600dfbdcbb1c8e469d62c1c9a9c162269a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 30 Jun 2020 23:28:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E6=9C=9F=E5=88=9D=E6=9C=9F=E6=9C=AB=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/service/depotHead/DepotHeadService.java  | 2 +-
 src/main/resources/mapper_xml/DepotHeadMapperEx.xml           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
index fda59f58..7f89af86 100644
--- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -350,7 +350,7 @@ public class DepotHeadService {
             modeName = "DiscountLastMoney";
             allOtherMoney = depotHeadMapperEx.findAllOtherMoney(supplierId, type, subType, endTime);
         }
-        BigDecimal result = null;
+        BigDecimal result = BigDecimal.ZERO;
         try{
             result =depotHeadMapperEx.findAllMoney(supplierId, type, subType, modeName, endTime);
         }catch(Exception e){
diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index 6121f421..c03ff273 100644
--- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -301,13 +301,13 @@
     </select>
 
     <select id="findAllMoney" resultType="java.math.BigDecimal">
-        select sum(${modeName}) as allMoney from jsh_depothead where Type='${type}' and SubType = '${subType}'
+        select ifnull(sum(${modeName}),0) as allMoney from jsh_depothead where Type='${type}' and SubType = '${subType}'
         and OrganId =${supplierId} and OperTime &lt;='${endTime}'
         and ifnull(delete_Flag,'0') !='1'
     </select>
 
     <select id="findAllOtherMoney" resultType="java.math.BigDecimal">
-        select sum(OtherMoney) as allOtherMoney from jsh_depothead where Type='${type}' and SubType = '${subType}'
+        select ifnull(sum(OtherMoney),0) as allOtherMoney from jsh_depothead where Type='${type}' and SubType = '${subType}'
         and OrganId =${supplierId} and OperTime &lt;='${endTime}'
         and ifnull(delete_Flag,'0') !='1'
     </select>