From a4f7f7a1c4417bd3cbbae58039b0e849f2293a8f Mon Sep 17 00:00:00 2001
From: dvadmin <1206709430@qq.com>
Date: Tue, 17 Aug 2021 02:15:06 +0000
Subject: [PATCH] =?UTF-8?q?addDateRange=20=E6=97=A5=E6=9C=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=90=9C=E7=B4=A2bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dvadmin-ui/src/utils/ruoyi.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dvadmin-ui/src/utils/ruoyi.js b/dvadmin-ui/src/utils/ruoyi.js
index 14d104b..860ac08 100755
--- a/dvadmin-ui/src/utils/ruoyi.js
+++ b/dvadmin-ui/src/utils/ruoyi.js
@@ -1,4 +1,4 @@
-/**
+/**
  * 通用js方法封装处理
  * Copyright (c) 2019 ruoyi
  */
@@ -53,9 +53,14 @@ export function resetForm(refName) {
 
 // 添加日期范围
 export function addDateRange(params, dateRange, propName) {
-  const search = JSON.parse(JSON.stringify(params));
-  if (dateRange != null && dateRange !== "" && dateRange.length !== 0) {
-    search.as = JSON.stringify({ create_datetime__range: dateRange });
+	let search = JSON.parse(JSON.stringify(params));
+  for (var key in dateRange) {
+    if (!dateRange[key]) {
+      delete dateRange[key]
+    }
+  }
+  if (null != dateRange && '' !== dateRange && JSON.stringify(dateRange) !== '{}') {
+    search.as = JSON.stringify(dateRange);
   }
   return search;
 }