diff --git a/src/main/java/com/management/controller/DesignController.java b/src/main/java/com/management/controller/DesignController.java index 1d5d918..79d6238 100644 --- a/src/main/java/com/management/controller/DesignController.java +++ b/src/main/java/com/management/controller/DesignController.java @@ -265,8 +265,13 @@ public class DesignController { //直发现场时间 long directDeliveryTime = designDocDetailData.getLong("direct_delivery_time__c") != null ? designDocDetailData.getLong("direct_delivery_time__c") : 0; + Date directDeliveryDate = null; - designDocDetailMap.put("deliverytime", new Date(directDeliveryTime)); + if (directDeliveryTime != 0){ + directDeliveryDate = new Date(directDeliveryTime); + } + + designDocDetailMap.put("deliverytime", directDeliveryDate); //直发现场地址 designDocDetailMap.put("deliverylocation", designDocDetailData.getString("direct_delivery_location__c") != null ? designDocDetailData.getString("direct_delivery_location__c") : "");