From 0e2ff6a6da1f385415611a393c04a2192f370383 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 22 八月 2021 10:41:26 +0800
Subject: [PATCH] update 优化copy工具增加空判断

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
index bea09f8..16a252d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
@@ -2,6 +2,8 @@
 
 import cn.hutool.core.bean.copier.BeanCopier;
 import cn.hutool.core.bean.copier.CopyOptions;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReflectUtil;
 
 import java.util.List;
@@ -36,6 +38,9 @@
 	 * @return desc
 	 */
 	public static <T, V> V oneCopy(T source, CopyOptions copyOptions, V desc) {
+		if (ObjectUtil.isNull(source)) {
+			return null;
+		}
 		return BeanCopier.create(source, desc, copyOptions).copy();
 	}
 
@@ -48,6 +53,12 @@
 	 * @return desc
 	 */
 	public static <T, V> List<V> listCopy(List<T> sourceList, CopyOptions copyOptions, Class<V> desc) {
+		if (ObjectUtil.isNull(sourceList)) {
+			return null;
+		}
+		if (CollUtil.isEmpty(sourceList)) {
+			return CollUtil.newArrayList();
+		}
 		return sourceList.stream()
 			.map(source -> oneCopy(source, copyOptions, desc))
 			.collect(Collectors.toList());

--
Gitblit v1.9.3