From ef5adf2e2a4134fd06ae1432df96434de0538ec3 Mon Sep 17 00:00:00 2001
From: Elune <201507802@qq.com>
Date: Thu, 04 Jun 2020 14:53:24 +0800
Subject: [PATCH] update ruoyi-ui/src/permission.js. 修复退出登录重定向到登录页，登录后参数丢失。/article?id=6
---
ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 27652fe..f0ab5e7 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -174,7 +174,7 @@
for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
{
Cell cell = heard.getCell(i);
- if (StringUtils.isNotNull(cell != null))
+ if (StringUtils.isNotNull(cell))
{
String value = this.getCellValue(heard, i).toString();
cellMap.put(value, i);
@@ -827,7 +827,7 @@
try
{
Cell cell = row.getCell(column);
- if (cell != null)
+ if (StringUtils.isNotNull(cell))
{
if (cell.getCellTypeEnum() == CellType.NUMERIC || cell.getCellTypeEnum() == CellType.FORMULA)
{
--
Gitblit v1.9.2