From 3fd9147afb374e7b3ac031aceaca67cef8f6ef3c Mon Sep 17 00:00:00 2001
From: dawn <csg0328@163.com>
Date: 星期三, 02 九月 2020 10:14:34 +0800
Subject: [PATCH] 解决“在只填加了字典类型，没有添加字典数据时，会出现缓存了空集合，即使后边添加了字典数据也没用，只能清空redis缓存。”的问题，小问题就是判断稍稍改了下，若依大大让我pr当个贡献者，很荣幸很欣慰。感谢！
---
ruoyi-ui/src/utils/ruoyi.js | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 462dc8f..b79f44c 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -1,4 +1,4 @@
-/**
+/**
* 通用js方法封装处理
* Copyright (c) 2019 ruoyi
*/
@@ -54,12 +54,15 @@
}
// 添加日期范围
-export function addDateRange (params = {}, dateRange) {
- if (dateRange != null && dateRange !== '') {
- params.beginTime = this.dateRange[0]
- params.endTime = this.dateRange[1]
+export function addDateRange(params, dateRange) {
+ var search = params;
+ search.beginTime = "";
+ search.endTime = "";
+ if (null != dateRange && '' != dateRange) {
+ search.beginTime = this.dateRange[0];
+ search.endTime = this.dateRange[1];
}
- return params
+ return search;
}
// 回显数据字典
@@ -128,7 +131,7 @@
id = id || 'id'
parentId = parentId || 'parentId'
children = children || 'children'
- rootId = rootId || 0
+ rootId = rootId || Math.min.apply(Math, data.map(item => { return item[parentId] })) || 0
//对源数据深度克隆
const cloneData = JSON.parse(JSON.stringify(data))
//循环所有项
--
Gitblit v1.9.2