From c20549fa0f5fa5538a9b5b4a06cf2f140cb1d4e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=89=E9=80=9F=E8=9C=97=E7=89=9B?= <361946749@qq.com>
Date: Sat, 25 Jul 2020 17:12:09 +0800
Subject: [PATCH] =?UTF-8?q?update=20jeecg-boot/jeecg-boot-base-common/src/?=
 =?UTF-8?q?main/java/org/jeecg/common/util/oConvertUtils.java.=20=E5=85=88?=
 =?UTF-8?q?=E5=88=A4=E6=96=ADnull=EF=BC=8C=E5=86=8D=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/jeecg/common/util/oConvertUtils.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/oConvertUtils.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/oConvertUtils.java
index e40b169c..28efe7b4 100644
--- a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/oConvertUtils.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/oConvertUtils.java
@@ -593,7 +593,7 @@ public class oConvertUtils {
 	 * @return
 	 */
 	public static<F,T> List<T> entityListToModelList(List<F> fromList, Class<T> tClass){
-		if(fromList.isEmpty() || fromList == null){
+		if(fromList == null || fromList.isEmpty()){
 			return null;
 		}
 		List<T> tList = new ArrayList<>();