From 15c4428b9c95bcb15d7efa29b061350d28e151b8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 24 十一月 2020 11:54:38 +0800
Subject: [PATCH] 修改 ruoyi CharsetKit.java bug
---
ruoyi-ui/src/utils/ruoyi.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index e77b155..e8243f6 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -59,8 +59,8 @@
search.beginTime = "";
search.endTime = "";
if (null != dateRange && '' != dateRange) {
- search.beginTime = this.dateRange[0];
- search.endTime = this.dateRange[1];
+ search.beginTime = dateRange[0];
+ search.endTime = dateRange[1];
}
return search;
}
@@ -131,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.3