From 9b9c1b999fe0b1e21c038a1d5227609071fd7aa4 Mon Sep 17 00:00:00 2001
From: yuhong0206@sina.cn <yuhong0206@sina.cn>
Date: 星期一, 29 三月 2021 09:00:44 +0800
Subject: [PATCH] 读取excel增加 if(row == null) { continue; } 判断。防止有时候Excel表中有空数据行，导致读取时出现空指针异常。
---
ruoyi-ui/src/utils/ruoyi.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 0cecbc0..81ee9c7 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -62,8 +62,8 @@
search.params["beginTime"] = dateRange[0];
search.params["endTime"] = dateRange[1];
} else {
- search.params[propName + "BeginTime"] = dateRange[0];
- search.params[propName + "EndTime"] = dateRange[1];
+ search.params["begin" + propName] = dateRange[0];
+ search.params["end" + propName] = dateRange[1];
}
}
return search;
--
Gitblit v1.9.2