审核时间

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/JsonChangeUtils.java

@@ -385,8 +385,11 @@ public class JsonChangeUtils implements ApplicationContextAware{
             }
             String supplierPromiseDate = sf.format(map.get("supplierPromiseDate"));
             jf.put("supplierPromiseDate",supplierPromiseDate+" 00:00:00");
-            String lineAttributeDatetime1 = sf.format(map.get("lineAttributeDatetime1"));
-            jf.put("lineAttributeDatetime1",lineAttributeDatetime1+" 00:00:00");
+            if(oConvertUtils.isNotEmpty(map.get("lineAttributeDatetime1"))){
+                String lineAttributeDatetime1 = sf.format(map.get("lineAttributeDatetime1"));
+                jf.put("lineAttributeDatetime1",lineAttributeDatetime1+" 00:00:00");
+            }
+
             Set<String> keysCfree = mapCfree.keySet();
             for (String key : keysCfree) {
                 jf.put("attributeCode"+ii, key);
@@ -455,8 +458,10 @@ public class JsonChangeUtils implements ApplicationContextAware{
             }
             String supplierPromiseDate = sf.format(map.get("supplierPromiseDate"));
             jf.put("supplierPromiseDate",supplierPromiseDate+" 00:00:00");
-            String lineAttributeDatetime1 = sf.format(map.get("lineAttributeDatetime1"));
-            jf.put("lineAttributeDatetime1",lineAttributeDatetime1+" 00:00:00");
+            if(oConvertUtils.isNotEmpty(map.get("lineAttributeDatetime1"))){
+                String lineAttributeDatetime1 = sf.format(map.get("lineAttributeDatetime1"));
+                jf.put("lineAttributeDatetime1",lineAttributeDatetime1+" 00:00:00");
+            }
             //查询委外用料子表数据
             if(map.get("pkorg").equals("one")){