From 000f2c4c226dc68e6c4c316919dd95a98de261fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?=
 <852955+jishenghua@users.noreply.gitee.com>
Date: Sat, 4 May 2019 09:38:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=97=B6=E9=97=B4=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D=E5=86=8D=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/service/depotHead/DepotHeadService.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 28df070a..9af976aa 100644
--- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -115,7 +115,9 @@ public class DepotHeadService {
                 if(dh.getTotalprice() != null) {
                     dh.setTotalprice(dh.getTotalprice().abs());
                 }
-                dh.setOpertimeStr(getCenternTime(dh.getOpertime()));
+                if(dh.getOpertime() != null) {
+                    dh.setOpertimeStr(getCenternTime(dh.getOpertime()));
+                }
                 dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId()));
                 resList.add(dh);
             }