From c0186580bae73cd0b70a7cec0e8c041e18ce3ad2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 16 三月 2021 10:57:26 +0800
Subject: [PATCH] fix 修复代码生成缺少jar异常
---
ruoyi-ui/src/utils/ruoyi.js | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index e77b155..53b2ae2 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 = this.dateRange[0];
- search.endTime = this.dateRange[1];
+ if (typeof(propName) === "undefined") {
+ search.params["beginTime"] = dateRange[0];
+ search.params["endTime"] = dateRange[1];
+ } else {
+ search.params["begin" + propName] = dateRange[0];
+ search.params["end" + propName] = dateRange[1];
+ }
}
return search;
}
@@ -131,7 +135,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