lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:20:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复BeanUtil.isCommonFieldsEqual判空导致的问题

Browse Source
This commit is contained in:
Looly 2023-07-05 09:45:48 +08:00
parent dffba89e50
commit 3cbbbcfe1b
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,7 +2,7 @@
# 🚀Changelog
-------------------------------------------------------------------------------------------------------------
# 5.8.21(2023-07-03)
# 5.8.21(2023-07-05)
### 🐣新特性
* 【core 】 list 为空时，CollUtil.max等返回null而非异常（pr#1027@Gitee）
@ -20,6 +20,7 @@
* 【core 】 修复PathUtil.getMimeType可能造成的异常（issue#3179@Github）
* 【core 】 修复Pair序列化转换无效问题（issue#I7GPGX@Github）
* 【core 】 修复TypeUtil.getTypeArgument对实现接口获取不全面问题（issue#I7CRIW@Gitee）
* 【core 】 修复BeanUtil.isCommonFieldsEqual判空导致的问题
-------------------------------------------------------------------------------------------------------------
# 5.8.20(2023-06-16)

12
hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java
View File

@ -994,15 +994,17 @@ public class BeanUtil {
return false;
}
Map<String, Object> sourceFieldsMap = BeanUtil.beanToMap(source);
Map<String, Object> targetFieldsMap = BeanUtil.beanToMap(target);
final Map<String, Object> sourceFieldsMap = BeanUtil.beanToMap(source);
final Map<String, Object> targetFieldsMap = BeanUtil.beanToMap(target);
Set<String> sourceFields = sourceFieldsMap.keySet();
final Set<String> sourceFields = sourceFieldsMap.keySet();
sourceFields.removeAll(Arrays.asList(ignoreProperties));
for (String field : sourceFields) {
if (ObjectUtil.notEqual(sourceFieldsMap.get(field), targetFieldsMap.get(field))) {
return false;
if(sourceFieldsMap.containsKey(field) && targetFieldsMap.containsKey(field)){
if (ObjectUtil.notEqual(sourceFieldsMap.get(field), targetFieldsMap.get(field))) {
return false;
}
}
}