diff --git a/jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/base/BaseMap.java b/jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/base/BaseMap.java index c26e5484..87ce9042 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/base/BaseMap.java +++ b/jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/base/BaseMap.java @@ -6,10 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import org.apache.commons.beanutils.ConvertUtils; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; /** @@ -36,7 +33,7 @@ public class BaseMap extends HashMap { } public BaseMap add(String key, Object value) { - super.put(key, Optional.ofNullable(value).orElse("")); + this.put(key,value); return this; } @@ -73,15 +70,15 @@ public class BaseMap extends HashMap { if (ObjectUtil.isNotEmpty(v)) { return (Long[]) v; } - return null; + return new Long[0]; } public List getListLong(String key) { List list = get(key); if (ObjectUtil.isNotEmpty(list)) { - return list.stream().map(e -> new Long(e)).collect(Collectors.toList()); + return list.stream().map(Long::new).collect(Collectors.toList()); } else { - return null; + return Collections.emptyList(); } } @@ -90,7 +87,7 @@ public class BaseMap extends HashMap { if (ObjectUtil.isNotEmpty(ids)) { return (Long[]) ConvertUtils.convert(ids.toString().split(","), Long.class); } else { - return null; + return new Long[0]; } }