From 6aecd35a4ff01c2811e3bc9aaf55a8f566e2ca10 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 13 Nov 2025 11:58:03 +0800
Subject: [PATCH] 修复combo属性过多sheet出现的异常问题
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
index 95a00b7..9ccdcf4 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.math.RoundingMode;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.text.NumberFormat;
@@ -313,7 +314,7 @@
* 转换为Integer数组<br>
*
* @param split 分隔符
- * @param split 被转换的值
+ * @param str 被转换的值
* @return 结果
*/
public static Integer[] toIntArray(String split, String str)
@@ -363,6 +364,10 @@
*/
public static String[] toStrArray(String str)
{
+ if (StringUtils.isEmpty(str))
+ {
+ return new String[] {};
+ }
return toStrArray(",", str);
}
@@ -370,7 +375,7 @@
* 转换为String数组<br>
*
* @param split 分隔符
- * @param split 被转换的值
+ * @param str 被转换的值
* @return 结果
*/
public static String[] toStrArray(String split, String str)
@@ -535,9 +540,9 @@
/**
* 转换为boolean<br>
- * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值<br>
+ * String支持的值为：true、false、yes、ok、no、1、0、是、否, 如果给定的值为空，或者转换失败，返回默认值<br>
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
@@ -561,18 +566,15 @@
switch (valueStr)
{
case "true":
+ case "yes":
+ case "ok":
+ case "1":
+ case "是":
return true;
case "false":
- return false;
- case "yes":
- return true;
- case "ok":
- return true;
case "no":
- return false;
- case "1":
- return true;
case "0":
+ case "否":
return false;
default:
return defaultValue;
@@ -717,7 +719,7 @@
}
if (value instanceof Double)
{
- return new BigDecimal((Double) value);
+ return BigDecimal.valueOf((Double) value);
}
if (value instanceof Integer)
{
@@ -907,7 +909,7 @@
*/
public static String toSBC(String input, Set<Character> notConvertSet)
{
- char c[] = input.toCharArray();
+ char[] c = input.toCharArray();
for (int i = 0; i < c.length; i++)
{
if (null != notConvertSet && notConvertSet.contains(c[i]))
@@ -949,7 +951,7 @@
*/
public static String toDBC(String text, Set<Character> notConvertSet)
{
- char c[] = text.toCharArray();
+ char[] c = text.toCharArray();
for (int i = 0; i < c.length; i++)
{
if (null != notConvertSet && notConvertSet.contains(c[i]))
@@ -967,9 +969,7 @@
c[i] = (char) (c[i] - 65248);
}
}
- String returnString = new String(c);
-
- return returnString;
+ return new String(c);
}
/**
@@ -990,7 +990,12 @@
String s = "";
for (int i = 0; i < fraction.length; i++)
{
- s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
+ // 优化double计算精度丢失问题
+ BigDecimal nNum = new BigDecimal(n);
+ BigDecimal decimal = new BigDecimal(10);
+ BigDecimal scale = nNum.multiply(decimal).setScale(2, RoundingMode.HALF_EVEN);
+ double d = scale.doubleValue();
+ s += (digit[(int) (Math.floor(d * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
}
if (s.length() < 1)
{
--
Gitblit v1.9.3