From 1be615c82253c5ef692328e8a139e74a0894bff5 Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Wed, 12 Oct 2022 12:44:07 +0800 Subject: [PATCH 1/2] fix MapToMap ignoreNullValue --- .../java/cn/hutool/core/bean/copier/MapToMapCopier.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToMapCopier.java b/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToMapCopier.java index e32eaf2e0..895a5f0be 100755 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToMapCopier.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToMapCopier.java @@ -48,10 +48,14 @@ public class MapToMapCopier extends AbsCopier { if (false == copyOptions.override && null != targetValue) { return; } + // 忽略空值 + if (false == copyOptions.ignoreNullValue && sValue == null) { + return; + } // 获取目标值真实类型并转换源值 final Type[] typeArguments = TypeUtil.getTypeArguments(this.targetType); - if(null != typeArguments){ + if (null != typeArguments) { //sValue = Convert.convertWithCheck(typeArguments[1], sValue, null, this.copyOptions.ignoreError); sValue = this.copyOptions.convertField(typeArguments[1], sValue); sValue = copyOptions.editFieldValue(sKeyStr, sValue); From ca40d7448e1a753cea4907cffffb877972e6470b Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Wed, 12 Oct 2022 12:46:12 +0800 Subject: [PATCH 2/2] fix MapToMap ignoreNullValue --- .../main/java/cn/hutool/core/bean/copier/MapToMapCopier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToMapCopier.java b/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToMapCopier.java index 895a5f0be..9c538b34a 100755 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToMapCopier.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToMapCopier.java @@ -49,7 +49,7 @@ public class MapToMapCopier extends AbsCopier { return; } // 忽略空值 - if (false == copyOptions.ignoreNullValue && sValue == null) { + if (true == copyOptions.ignoreNullValue && sValue == null) { return; }