From 9067369ce0eeaf8b4d6e0de309804361d7d25b5f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 31 Dec 2019 17:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=97=B6=E9=97=B4=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E5=87=BA=E7=8E=B0=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/utils/ruoyi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 602fdd6c6..069a1aec2 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -7,7 +7,7 @@ const baseURL = process.env.VUE_APP_BASE_API
 
 // 日期格式化
 export function parseTime(time, pattern) {
-	if (arguments.length === 0) {
+	if (arguments.length === 0 || !time) {
 		return null
 	}
 	const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'