Bridge 3 lat temu
rodzic
commit
2a70e8c43f

+ 1 - 0
src/main/java/cn/fastfun/service/impl/AppDeviceServiceImp.java

@@ -39,6 +39,7 @@ public class AppDeviceServiceImp extends JpaServiceImp<AppDevice, String> implem
         DeviceAttrDTO diffAttrDTO = null;
         for (Map<String, Object> p : list) {
             AppDevice device = new AppDevice(p);
+            if(null == device.getDeliverTime()) new ApiRuntimeException("发货时间读取错误");
             // 数据效验
             if (null == diffAttrDTO) {
                 diffAttrDTO = new DeviceAttrDTO(device.getBatchNum(), device.getSn());

+ 2 - 1
src/main/java/cn/fastfun/util/DateUtils.java

@@ -27,7 +27,8 @@ public class DateUtils {
     }
 
     public static String toString(Date time, String pattern) {
-        return new SimpleDateFormat(pattern).format(time);
+
+        return null == time ? "" : new SimpleDateFormat(pattern).format(time);
     }
 
     public static Date setDateTime(Date date, String hms) {