From 84fe0737ded021a02e258d2123c1fbcf8afa9b5d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: Wed, 16 Feb 2022 16:53:11 +0800
Subject: [PATCH] update 更新uuid去除默认值 漏改
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 22b6b57..f852f95 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -88,7 +88,6 @@
public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
-
/**
* Excel sheet最大行数，默认65536
*/
@@ -1122,7 +1121,7 @@
if (StringUtils.isNotEmpty(excel.targetAttr()))
{
String target = excel.targetAttr();
- if (target.indexOf(".") > -1)
+ if (target.contains("."))
{
String[] targets = target.split("[.]");
for (String name : targets)
@@ -1217,7 +1216,7 @@
for (Object[] os : this.fields)
{
Excel excel = (Excel) os[1];
- maxHeight = maxHeight > excel.height() ? maxHeight : excel.height();
+ maxHeight = Math.max(maxHeight, excel.height());
}
return (short) (maxHeight * 20);
}
--
Gitblit v1.9.2