in不能拼接'' (#48)

x-ream · Apr 13, 2022 · ad02afb · ad02afb
1 parent 3cb9954
commit ad02afb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/sqli-builder/src/main/java/io/xream/sqli/builder/ConditionBuilder.java b/sqli-builder/src/main/java/io/xream/sqli/builder/ConditionBuilder.java
@@ -204,7 +204,6 @@ public ConditionBuilder endSub(){
         return this.instance;
     }
 
-
     private ConditionBuilder doGle(Op p, String property, Object value) {
         if (value == null){
             isOr();
@@ -246,7 +245,7 @@ private ConditionBuilder doIn(Op p, String property, List<? extends Object> list
 
         List<Object> tempList = new ArrayList<>();
         for (Object obj : list) {
-            if (Objects.isNull(obj))
+            if (SqliStringUtil.isNullOrEmpty(obj))
                 continue;
             if (!tempList.contains(obj)) {
                 tempList.add(obj);

diff --git a/sqli-builder/src/main/java/io/xream/sqli/builder/ConditionToSql.java b/sqli-builder/src/main/java/io/xream/sqli/builder/ConditionToSql.java
@@ -103,7 +103,7 @@ default void buildIn(StringBuilder sb, Class clzz, List<? extends Object> inList
 
             for (int j = 0; j < length; j++) {
                 Object value = inList.get(j);
-                if (value == null || SqliStringUtil.isNullOrEmpty(value.toString()))
+                if (value == null )
                     continue;
                 value = filter(value.toString());
                 sb.append(SqlScript.SINGLE_QUOTES).append(value).append(SqlScript.SINGLE_QUOTES);//'string'

diff --git a/sqli-builder/src/main/java/io/xream/sqli/util/SqliStringUtil.java b/sqli-builder/src/main/java/io/xream/sqli/util/SqliStringUtil.java
@@ -30,7 +30,7 @@ public static boolean isNotNull(String str){
 	}
 
 	public static boolean isNullOrEmpty(String str){
-		return str == null || str.equals("") || str.equals("null") || str.equals("NaN") || str.equals("undefined");
+		return str == null || str.equals("")  || str.trim().equals("");
 	}
 
 	public static boolean isNullOrEmpty(Object obj) {