From cf7f51a6337fb97525c7fcfb5d6b1afb7e10ac9f Mon Sep 17 00:00:00 2001
From: 葛瑞士 <gers@neoceansoft.com>
Date: 星期三, 09 十二月 2020 16:05:09 +0800
Subject: [PATCH] 解决多文件上传Log报错

---
 ruoyi-ui/src/utils/ruoyi.js |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 994c0cc..0cecbc0 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -54,13 +54,17 @@
 }
 
 // 添加日期范围
-export function addDateRange(params, dateRange) {
+export function addDateRange(params, dateRange, propName) {
 	var search = params;
-	search.beginTime = "";
-	search.endTime = "";
+	search.params = {};
 	if (null != dateRange && '' != dateRange) {
-		search.beginTime = dateRange[0];
-		search.endTime = dateRange[1];
+		if (typeof(propName) === "undefined") {
+			search.params["beginTime"] = dateRange[0];
+			search.params["endTime"] = dateRange[1];
+		} else {
+			search.params[propName + "BeginTime"] = dateRange[0];
+			search.params[propName + "EndTime"] = dateRange[1];
+		}
 	}
 	return search;
 }

--
Gitblit v1.9.2