From 4a6a32db0122943629ad2f61bf2c3c6fa2ddf502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 2 Jan 2023 23:02:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/service/accountHead/AccountHeadService.java   | 4 +++-
 .../java/com/jsh/erp/service/depotHead/DepotHeadService.java  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
index 347a8896..346dbaf3 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java
@@ -395,7 +395,9 @@ public class AccountHeadService {
                 if(ah.getTotalPrice() != null) {
                     ah.setTotalPrice(ah.getTotalPrice().abs());
                 }
-                ah.setBillTimeStr(getCenternTime(ah.getBillTime()));
+                if(ah.getBillTime() !=null) {
+                    ah.setBillTimeStr(getCenternTime(ah.getBillTime()));
+                }
                 resList.add(ah);
             }
         }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
index 0b0500d7..237e5715 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -811,7 +811,9 @@ public class DepotHeadService {
                     if(StringUtil.isNotEmpty(dh.getSalesMan())) {
                         dh.setSalesManStr(personService.getPersonByMapAndIds(personMap,dh.getSalesMan()));
                     }
-                    dh.setOperTimeStr(getCenternTime(dh.getOperTime()));
+                    if(dh.getOperTime() != null) {
+                        dh.setOperTimeStr(getCenternTime(dh.getOperTime()));
+                    }
                     //商品信息简述
                     if(materialsListMap!=null) {
                         dh.setMaterialsList(materialsListMap.get(dh.getId()));