From 461ba16e55a20959422a7fd3cf6fd174bd03d100 Mon Sep 17 00:00:00 2001
From: liuenxin <lcyex_028@163.com>
Date: Sat, 7 Nov 2020 11:30:13 +0800
Subject: [PATCH] =?UTF-8?q?Columns=E7=BB=84=E8=A3=85sql=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E7=B1=BBin()=E3=80=81notIn()=E6=96=B9=E6=B3=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AE=89=E5=85=A8=E6=A8=A1=E5=BC=8F=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AE=89=E5=85=A8=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=EF=BC=8CList=E4=B8=8D=E4=B8=BAnull=EF=BC=8C=E4=BD=86=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=85=83=E7=B4=A0=E6=97=B6=E8=B7=B3=E8=BF=87=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/io/jboot/db/model/Columns.java     | 2 ++
 src/main/java/io/jboot/db/model/Util.java        | 9 +++++++++
 src/main/java/io/jboot/utils/CollectionUtil.java | 5 +++++
 3 files changed, 16 insertions(+)

diff --git a/src/main/java/io/jboot/db/model/Columns.java b/src/main/java/io/jboot/db/model/Columns.java
index 2fc526af..80a111b7 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 665dafa3..75bee405 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 459eb2bf..0e614b67 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();
+    }
 }
-- 
Gitee