diff --git a/src/main/java/io/jboot/db/model/Columns.java b/src/main/java/io/jboot/db/model/Columns.java index 2fc526af1b83a9f952c08edf6a18be0c47317f81..80a111b7a273ea493fa24fdcd2ae3541ebca7ac0 100644 --- a/src/main/java/io/jboot/db/model/Columns.java +++ b/src/main/java/io/jboot/db/model/Columns.java @@ -299,6 +299,7 @@ public class Columns implements Serializable { * @return */ public Columns in(String name, List list) { + Util.checkNullParas(this, list); if (list != null && !list.isEmpty()) { in(name, list.toArray()); } @@ -326,6 +327,7 @@ public class Columns implements Serializable { * @return */ public Columns notIn(String name, List list) { + Util.checkNullParas(this, list); if (list != null && !list.isEmpty()) { notIn(name, list.toArray()); } diff --git a/src/main/java/io/jboot/db/model/Util.java b/src/main/java/io/jboot/db/model/Util.java index 665dafa3cc12a1ddfb0a57ae25131b4f4c1cd39d..75bee405a2fc92ee4d22ea7949ef7270d03aaed9 100644 --- a/src/main/java/io/jboot/db/model/Util.java +++ b/src/main/java/io/jboot/db/model/Util.java @@ -17,6 +17,7 @@ package io.jboot.db.model; import com.jfinal.ext.kit.DateKit; +import io.jboot.utils.CollectionUtil; import io.jboot.utils.StrUtil; import java.util.*; @@ -168,4 +169,12 @@ class Util { } } } + + static void checkNullParas(Columns columns, List list) { + if (columns.isUseSafeMode()) { + if (CollectionUtil.isEmpty(list)) { + throw new NullPointerException("Columns must has not empty collection in safeMode."); + } + } + } } diff --git a/src/main/java/io/jboot/utils/CollectionUtil.java b/src/main/java/io/jboot/utils/CollectionUtil.java index 459eb2bfe289d608edcff040d52f105c974762aa..0e614b678513033479246dc3b8199126b8085492 100644 --- a/src/main/java/io/jboot/utils/CollectionUtil.java +++ b/src/main/java/io/jboot/utils/CollectionUtil.java @@ -15,6 +15,7 @@ */ package io.jboot.utils; +import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -37,4 +38,8 @@ public class CollectionUtil { } return map; } + + public static boolean isEmpty(Collection collection){ + return collection == null || collection.isEmpty(); + } }