From bf622edba20e6cb0081690fa93a7600d85c5b5f4 Mon Sep 17 00:00:00 2001
From: Parker <meet.parker@foxmail.com>
Date: Tue, 9 Mar 2021 15:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=AC=E6=8D=A2=E7=B1=BB?=
 =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AEBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/opsli/common/utils/WrapperUtil.java    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/WrapperUtil.java b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/WrapperUtil.java
index 912239b4..90a740a1 100644
--- a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/WrapperUtil.java
+++ b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/WrapperUtil.java
@@ -16,16 +16,13 @@
 package org.opsli.common.utils;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.ReflectUtil;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -76,6 +73,10 @@ public final class WrapperUtil {
      * @return M
      */
     public static <T,M> M transformInstance(Object source, Class<M> target, boolean isClone){
+        if(source == null){
+            return null;
+        }
+
         if(isClone){
             source = ObjectUtil.cloneByStream(source);
         }
@@ -99,6 +100,10 @@ public final class WrapperUtil {
      * @return List<M>
      */
     public static <T,M> List<M> transformInstance(Collection<T> source, Class<M> target, boolean isClone){
+        if(CollUtil.isEmpty(source)){
+            return null;
+        }
+
         if(isClone){
             source = ObjectUtil.cloneByStream(source);
         }