From 14db7538e83f5b17d49de0d0259350cd36106ffa Mon Sep 17 00:00:00 2001 From: dazer007 Date: Mon, 22 Jan 2024 14:09:20 +0800 Subject: [PATCH] =?UTF-8?q?NumberConverter=E6=94=AF=E6=8C=81null=E5=80=BC?= =?UTF-8?q?=EF=BC=8C=E6=AF=94=E5=A6=82=EF=BC=9ABeanUtil.copyProperties(aDT?= =?UTF-8?q?O,=20bVo,=20copyOptions)=20=E5=87=BA=E7=8E=B0null=E6=98=AF?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E5=8F=96=E5=80=BC=EF=BC=8C=E8=80=8C=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E6=8A=A5=E9=94=99=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hutool/core/convert/impl/NumberConverter.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/NumberConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/NumberConverter.java index 43c789e87f..d05e816cf3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/NumberConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/NumberConverter.java @@ -13,12 +13,12 @@ package org.dromara.hutool.core.convert.impl; import org.dromara.hutool.core.convert.AbstractConverter; -import org.dromara.hutool.core.convert.ConvertException; import org.dromara.hutool.core.date.DateUtil; import org.dromara.hutool.core.math.NumberUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.util.BooleanUtil; import org.dromara.hutool.core.util.ByteUtil; +import org.dromara.hutool.core.util.ObjUtil; import java.math.BigDecimal; import java.math.BigInteger; @@ -74,10 +74,6 @@ public class NumberConverter extends AbstractConverter { return StrUtil.subPre(result, -1); } } - - if(StrUtil.isEmpty(result)){ - throw new ConvertException("Can not convert empty value to Number!"); - } return result; } @@ -98,6 +94,9 @@ public class NumberConverter extends AbstractConverter { * @since 5.5.0 */ protected static Number convert(final Object value, final Class targetType, final Function toStrFunc) { + if (ObjUtil.isEmpty(value)) { + return null; + } // 枚举转换为数字默认为其顺序 if (value instanceof Enum) { return convert(((Enum) value).ordinal(), targetType, toStrFunc); -- Gitee