!289 添加日期范围支持重复添加多组日期范围，请求参数中对象的属性为null、undefined不进行拼接

Merge pull request !289 from wangzhaoqiang/master

ruoyi-ui/src/utils/request.js

@@ -28,9 +28,11 @@ service.interceptors.request.use(config => {
       if (value !== null && typeof(value) !== "undefined") {
         if (typeof value === 'object') {
           for (const key of Object.keys(value)) {
-            let params = propName + '[' + key + ']';
+            if (value[key] !== null && typeof (value[key]) !== 'undefined') {
-            var subPart = encodeURIComponent(params) + "=";
+              let params = propName + '[' + key + ']'
-            url += subPart + encodeURIComponent(value[key]) + "&";
+              let subPart = encodeURIComponent(params) + '='
+              url += subPart + encodeURIComponent(value[key]) + '&'
+            }
           }
         } else {
           url += part + encodeURIComponent(value) + "&";

ruoyi-ui/src/utils/ruoyi.js

@@ -55,18 +55,17 @@ export function resetForm(refName) {
 
 // 添加日期范围
 export function addDateRange(params, dateRange, propName) {
-	var search = params;
+  let search = params
-	search.params = {};
+  search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}
-	if (null != dateRange && '' != dateRange) {
+  dateRange = Array.isArray(dateRange) ? dateRange : []
-		if (typeof (propName) === "undefined") {
+  if (typeof (propName) === 'undefined') {
-			search.params["beginTime"] = dateRange[0];
+    search.params['beginTime'] = dateRange[0]
-			search.params["endTime"] = dateRange[1];
+    search.params['endTime'] = dateRange[1]
-		} else {
+  } else {
-			search.params["begin" + propName] = dateRange[0];
+    search.params['begin' + propName] = dateRange[0]
-			search.params["end" + propName] = dateRange[1];
+    search.params['end' + propName] = dateRange[1]
-		}
+  }
-	}
+  return search
-	return search;
 }
 
 // 回显数据字典