numberUtil change to isBlank

This commit is contained in:
Looly 2021-06-18 18:22:49 +08:00
parent cd63bdd755
commit f679ec633f
2 changed files with 8 additions and 5 deletions

View File

@ -11,6 +11,7 @@
* 【core 】 增加StrJoiner * 【core 】 增加StrJoiner
* 【core 】 增加TreeBuilder * 【core 】 增加TreeBuilder
* 【core 】 IterUtil增加getFirstNonNull方法 * 【core 】 IterUtil增加getFirstNonNull方法
* 【core 】 NumberUtil判空改为isBlankissue#1664@Github
### 🐞Bug修复 ### 🐞Bug修复
* 【db 】 修复Oracle下别名错误造成的SQL语法啊错误issue#I3VTQW@Gitee * 【db 】 修复Oracle下别名错误造成的SQL语法啊错误issue#I3VTQW@Gitee

View File

@ -158,10 +158,10 @@ public class NumberUtil {
} }
String value = values[0]; String value = values[0];
BigDecimal result = null == value ? BigDecimal.ZERO : new BigDecimal(value); BigDecimal result = StrUtil.isBlank(value) ? BigDecimal.ZERO : new BigDecimal(value);
for (int i = 1; i < values.length; i++) { for (int i = 1; i < values.length; i++) {
value = values[i]; value = values[i];
if (null != value) { if (StrUtil.isNotBlank(value)) {
result = result.add(new BigDecimal(value)); result = result.add(new BigDecimal(value));
} }
} }
@ -298,10 +298,10 @@ public class NumberUtil {
} }
String value = values[0]; String value = values[0];
BigDecimal result = null == value ? BigDecimal.ZERO : new BigDecimal(value); BigDecimal result = StrUtil.isBlank(value) ? BigDecimal.ZERO : new BigDecimal(value);
for (int i = 1; i < values.length; i++) { for (int i = 1; i < values.length; i++) {
value = values[i]; value = values[i];
if (null != value) { if (StrUtil.isNotBlank(value)) {
result = result.subtract(new BigDecimal(value)); result = result.subtract(new BigDecimal(value));
} }
} }
@ -729,7 +729,9 @@ public class NumberUtil {
* @return 两个参数的商 * @return 两个参数的商
*/ */
public static BigDecimal div(String v1, String v2, int scale, RoundingMode roundingMode) { public static BigDecimal div(String v1, String v2, int scale, RoundingMode roundingMode) {
return div(new BigDecimal(v1), new BigDecimal(v2), scale, roundingMode); final BigDecimal bd1 = StrUtil.isBlank(v1) ? BigDecimal.ZERO : new BigDecimal(v1);
final BigDecimal bd2 = StrUtil.isBlank(v2) ? BigDecimal.ZERO : new BigDecimal(v2);
return div(bd1, bd2, scale, roundingMode);
} }
/** /**