From 2b1c3335f680526e9f7e120f6b0163e04405b933 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 03 八月 2021 10:07:20 +0800
Subject: [PATCH] !74 Fix 修复DictUtils方法报错 Merge pull request !74 from jackytang/N/A
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 15b7d54..e60abf2 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
@@ -218,9 +218,9 @@
if (String.class == fieldType)
{
String s = Convert.toStr(val);
- if (StringUtils.endWith(s, ".0"))
+ if (StringUtils.endsWith(s, ".0"))
{
- val = StringUtils.subBefore(s, ".0",false);
+ val = StringUtils.substringBefore(s, ".0");
}
else
{
@@ -715,7 +715,7 @@
for (String item : convertSource)
{
String[] itemArray = item.split("=");
- if (StringUtils.containsAny(propertyValue, separator))
+ if (StringUtils.containsAny(separator, propertyValue))
{
for (String value : propertyValue.split(separator))
{
@@ -734,7 +734,7 @@
}
}
}
- return StringUtils.strip(propertyString.toString(), null,separator);
+ return StringUtils.stripEnd(propertyString.toString(), separator);
}
/**
@@ -752,7 +752,7 @@
for (String item : convertSource)
{
String[] itemArray = item.split("=");
- if (StringUtils.containsAny(propertyValue, separator))
+ if (StringUtils.containsAny(separator, propertyValue))
{
for (String value : propertyValue.split(separator))
{
@@ -771,7 +771,7 @@
}
}
}
- return StringUtils.strip(propertyString.toString(), null,separator);
+ return StringUtils.stripEnd(propertyString.toString(), separator);
}
/**
--
Gitblit v1.9.3