abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化MapstructUtils空判断

Browse Source 
Signed-off-by: 秋辞未寒 <545073804@qq.com>
This commit is contained in:
秋辞未寒 2025-01-06 03:35:13 +00:00 committed by Gitee
parent b9f861685a
commit bab860e1a0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java
View File

@ -59,7 +59,7 @@ public class MapstructUtils {
* @return target * @return target
*/ */
public static <T, V> V convert(T source, V target) { public static <T, V> V convert(T source, V target) {
if (ObjectUtil.hasNull(source)) { if (ObjectUtil.hasNull(source, target)) {
return null; return null;
} }
return CONVERTER.convert(source, target); return CONVERTER.convert(source, target);
@ -74,7 +74,7 @@ public class MapstructUtils {
* @return target * @return target
*/ */
public static <T, V> V convert(T source, V target, Consumer<V> beanConsumer) { public static <T, V> V convert(T source, V target, Consumer<V> beanConsumer) {
if (ObjectUtil.hasNull(source)) { if (ObjectUtil.hasNull(source, target)) {
return null; return null;
} }
return CONVERTER.convert(source, target, beanConsumer); return CONVERTER.convert(source, target, beanConsumer);
@ -88,7 +88,7 @@ public class MapstructUtils {
* @return targetType * @return targetType
*/ */
public static <T, V> List<V> convert(List<T> sourceList, Class<V> targetType) { public static <T, V> List<V> convert(List<T> sourceList, Class<V> targetType) {
if (CollUtil.isEmpty(sourceList)) { if (CollUtil.isEmpty(sourceList) || ObjectUtil.isNull(targetType)) {
return CollUtil.newArrayList(); return CollUtil.newArrayList();
} }
return CONVERTER.convert(sourceList, targetType); return CONVERTER.convert(sourceList, targetType);
@ -103,7 +103,7 @@ public class MapstructUtils {
* @return targetType * @return targetType
*/ */
public static <T, V> List<V> convert(List<T> sourceList, Class<V> targetType, Consumer<V> beanConsumer) { public static <T, V> List<V> convert(List<T> sourceList, Class<V> targetType, Consumer<V> beanConsumer) {
if (CollUtil.isEmpty(sourceList)) { if (CollUtil.isEmpty(sourceList) || ObjectUtil.isNull(targetType)) {
return CollUtil.newArrayList(); return CollUtil.newArrayList();
} }
return CONVERTER.convert(sourceList, targetType, beanConsumer); return CONVERTER.convert(sourceList, targetType, beanConsumer);