diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java
index d79efb10..427085de 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java
@@ -148,26 +148,20 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition eq(Object value, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, value).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, value));
     }
 
     @Override
     public QueryCondition eq(Object value, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, value).when(isEffective)));
+        return eq(value, isEffective.getAsBoolean());
     }
 
     @Override
     public <T> QueryCondition eq(T value, Predicate<T> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, value).when(isEffective.test(value)));
+        return eq(value, isEffective.test(value));
     }
 
     @Override
@@ -180,26 +174,20 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition ne(Object value, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, value).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, value));
     }
 
     @Override
     public QueryCondition ne(Object value, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, value).when(isEffective));
+        return ne(value, isEffective.getAsBoolean());
     }
 
     @Override
     public <T> QueryCondition ne(T value, Predicate<T> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, value).when(isEffective.test(value)));
+        return ne(value, isEffective.test(value));
     }
 
     @Override
@@ -212,26 +200,20 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition gt(Object value, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.GT, value).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.GT, value));
     }
 
     @Override
     public QueryCondition gt(Object value, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.GT, value).when(isEffective));
+        return gt(value, isEffective.getAsBoolean());
     }
 
     @Override
     public <T> QueryCondition gt(T value, Predicate<T> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.GT, value).when(isEffective.test(value)));
+        return gt(value, isEffective.test(value));
     }
 
     @Override
@@ -244,26 +226,20 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition ge(Object value, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.GE, value).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.GE, value));
     }
 
     @Override
     public QueryCondition ge(Object value, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.GE, value).when(isEffective));
+        return gt(value, isEffective.getAsBoolean());
     }
 
     @Override
     public <T> QueryCondition ge(T value, Predicate<T> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.GE, value).when(isEffective.test(value)));
+        return gt(value, isEffective.test(value));
     }
 
     @Override
@@ -276,26 +252,20 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition lt(Object value, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LT, value).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LT, value));
     }
 
     @Override
     public QueryCondition lt(Object value, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LT, value).when(isEffective));
+        return lt(value, isEffective.getAsBoolean());
     }
 
     @Override
     public <T> QueryCondition lt(T value, Predicate<T> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LT, value).when(isEffective.test(value)));
+        return lt(value, isEffective.test(value));
     }
 
     @Override
@@ -308,48 +278,49 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition le(Object value, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LE, value).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LE, value));
     }
 
     @Override
     public QueryCondition le(Object value, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LE, value).when(isEffective));
+        return le(value, isEffective.getAsBoolean());
     }
 
     @Override
     public <T> QueryCondition le(T value, Predicate<T> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LE, value).when(isEffective.test(value)));
+        return le(value, isEffective.test(value));
     }
 
     @Override
     public QueryCondition in(Object... value) {
-        return in(value, true);
-    }
-
-    @Override
-    public QueryCondition in(Object[] value, boolean isEffective) {
         if (QueryColumnBehavior.shouldIgnoreValue(value)) {
             return QueryCondition.createEmpty();
         }
         // IN 里面只有一个值的情况
         if (value.length == 1) {
-            if (QueryColumnBehavior.shouldIgnoreValue(value[0])) {
-                return QueryCondition.createEmpty();
-            }
             if (QueryColumnBehavior.isSmartConvertInToEquals()) {
-                return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, value[0]).when(isEffective));
+                return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, value[0]));
             }
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, value).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, value));
+
+    }
+
+    @Override
+    public QueryCondition in(Object[] value, boolean isEffective) {
+        if (!isEffective) {
+            return QueryCondition.createEmpty();
+        }
+        // IN 里面只有一个值的情况
+        if (value.length == 1) {
+            if (QueryColumnBehavior.isSmartConvertInToEquals()) {
+                return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, value[0]));
+            }
+        }
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, value));
     }
 
     @Override
@@ -364,11 +335,6 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition in(Collection<?> value) {
-        return in(value, true);
-    }
-
-    @Override
-    public QueryCondition in(Collection<?> value, boolean isEffective) {
         if (QueryColumnBehavior.shouldIgnoreValue(value)) {
             return QueryCondition.createEmpty();
         }
@@ -379,10 +345,28 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
                 return QueryCondition.createEmpty();
             }
             if (QueryColumnBehavior.isSmartConvertInToEquals()) {
-                return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, next).when(isEffective));
+                return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, next));
             }
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, value).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, value));
+    }
+
+    @Override
+    public QueryCondition in(Collection<?> value, boolean isEffective) {
+        if (!isEffective) {
+            return QueryCondition.createEmpty();
+        }
+        // IN 里面只有一个值的情况
+        if (value.size() == 1) {
+            Object next = value.iterator().next();
+            if (QueryColumnBehavior.shouldIgnoreValue(next)) {
+                return QueryCondition.createEmpty();
+            }
+            if (QueryColumnBehavior.isSmartConvertInToEquals()) {
+                return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, next));
+            }
+        }
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, value));
     }
 
     @Override
@@ -397,7 +381,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition in(QueryWrapper queryWrapper) {
-        if (queryWrapper == null) {
+        if (QueryColumnBehavior.shouldIgnoreValue(queryWrapper)) {
             return QueryCondition.createEmpty();
         }
         return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, queryWrapper));
@@ -405,40 +389,39 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition in(QueryWrapper queryWrapper, boolean isEffective) {
-        if (queryWrapper == null) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, queryWrapper).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, queryWrapper));
     }
 
     @Override
     public QueryCondition in(QueryWrapper queryWrapper, BooleanSupplier isEffective) {
-        if (queryWrapper == null) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, queryWrapper).when(isEffective));
+        return in(queryWrapper, isEffective.getAsBoolean());
     }
 
     @Override
     public QueryCondition notIn(Object... value) {
-        return notIn(value, true);
-    }
-
-    @Override
-    public QueryCondition notIn(Object[] value, boolean isEffective) {
         if (QueryColumnBehavior.shouldIgnoreValue(value)) {
             return QueryCondition.createEmpty();
         }
         // NOT IN 里面只有一个值的情况
-        if (value.length == 1) {
-            if (QueryColumnBehavior.shouldIgnoreValue(value[0])) {
-                return QueryCondition.createEmpty();
-            }
-            if (QueryColumnBehavior.isSmartConvertInToEquals()) {
-                return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, value[0]).when(isEffective));
-            }
+        if (value.length == 1 && QueryColumnBehavior.isSmartConvertInToEquals()) {
+            return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, value[0]));
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, value).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, value));
+    }
+
+    @Override
+    public QueryCondition notIn(Object[] value, boolean isEffective) {
+        if (!isEffective) {
+            return QueryCondition.createEmpty();
+        }
+        // NOT IN 里面只有一个值的情况
+        if (value.length == 1 && QueryColumnBehavior.isSmartConvertInToEquals()) {
+            return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, value[0]));
+        }
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, value));
     }
 
     @Override
@@ -453,25 +436,29 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition notIn(Collection<?> value) {
-        return notIn(value, true);
-    }
-
-    @Override
-    public QueryCondition notIn(Collection<?> value, boolean isEffective) {
         if (QueryColumnBehavior.shouldIgnoreValue(value)) {
             return QueryCondition.createEmpty();
         }
         // NOT IN 里面只有一个值的情况
-        if (value.size() == 1) {
+        if (value.size() == 1 && QueryColumnBehavior.isSmartConvertInToEquals()) {
             Object next = value.iterator().next();
-            if (QueryColumnBehavior.shouldIgnoreValue(next)) {
-                return QueryCondition.createEmpty();
-            }
-            if (QueryColumnBehavior.isSmartConvertInToEquals()) {
-                return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, next).when(isEffective));
-            }
+            return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, next));
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, value).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, value));
+    }
+
+    @Override
+    public QueryCondition notIn(Collection<?> value, boolean isEffective) {
+        if (!isEffective) {
+            return QueryCondition.createEmpty();
+        }
+        // NOT IN 里面只有一个值的情况
+        // NOT IN 里面只有一个值的情况
+        if (value.size() == 1 && QueryColumnBehavior.isSmartConvertInToEquals()) {
+            Object next = value.iterator().next();
+            return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, next));
+        }
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, value));
     }
 
     @Override
@@ -486,7 +473,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition notIn(QueryWrapper queryWrapper) {
-        if (queryWrapper == null) {
+        if (QueryColumnBehavior.shouldIgnoreValue(queryWrapper)) {
             return QueryCondition.createEmpty();
         }
         return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, queryWrapper));
@@ -494,36 +481,41 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition notIn(QueryWrapper queryWrapper, boolean isEffective) {
-        if (queryWrapper == null) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, queryWrapper).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, queryWrapper));
     }
 
     @Override
     public QueryCondition notIn(QueryWrapper queryWrapper, BooleanSupplier isEffective) {
-        if (queryWrapper == null) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, queryWrapper).when(isEffective));
+        return notIn(queryWrapper, isEffective.getAsBoolean());
     }
 
     @Override
     public QueryCondition between(Object[] values) {
-        if (QueryColumnBehavior.shouldIgnoreValue(values) || values.length < 2) {
+        if (QueryColumnBehavior.shouldIgnoreValue(values)) {
             return QueryCondition.createEmpty();
         }
 
+        if (values == null || values.length != 2) {
+            throw new IllegalArgumentException("values is null or length is not 2");
+        }
+
         return between(values[0], values[values.length - 1]);
     }
 
     @Override
     public QueryCondition between(Object[] values, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(values) || values.length < 2) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
 
-        return between(values[0], values[values.length - 1], isEffective);
+        if (values == null || values.length != 2) {
+            throw new IllegalArgumentException("values is null or length is not 2");
+        }
+
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.BETWEEN, values));
     }
 
     @Override
@@ -536,44 +528,46 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition between(Object start, Object end, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.BETWEEN, new Object[]{start, end}).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.BETWEEN, new Object[]{start, end}));
     }
 
     @Override
     public QueryCondition between(Object start, Object end, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.BETWEEN, new Object[]{start, end}).when(isEffective));
+        return between(start, end, isEffective.getAsBoolean());
     }
 
     @Override
     public <S, E> QueryCondition between(S start, E end, BiPredicate<S, E> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.BETWEEN, new Object[]{start, end}).when(isEffective.test(start, end)));
+        return between(start, end, isEffective.test(start, end));
     }
 
     @Override
     public QueryCondition notBetween(Object[] values) {
-        if (QueryColumnBehavior.shouldIgnoreValue(values) || values.length < 2) {
+        if (QueryColumnBehavior.shouldIgnoreValue(values)) {
             return QueryCondition.createEmpty();
         }
 
+        if (values == null || values.length != 2) {
+            throw new IllegalArgumentException("values is null or length is not 2");
+        }
+
         return notBetween(values[0], values[values.length - 1]);
     }
 
     @Override
     public QueryCondition notBetween(Object[] values, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(values) || values.length < 2) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
 
-        return notBetween(values[0], values[values.length - 1], isEffective);
+        if (values == null || values.length != 2) {
+            throw new IllegalArgumentException("values is null or length is not 2");
+        }
+
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_BETWEEN, values));
     }
 
     @Override
@@ -586,26 +580,20 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition notBetween(Object start, Object end, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_BETWEEN, new Object[]{start, end}).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_BETWEEN, new Object[]{start, end}));
     }
 
     @Override
     public QueryCondition notBetween(Object start, Object end, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_BETWEEN, new Object[]{start, end}).when(isEffective));
+        return notBetween(start, end, isEffective.getAsBoolean());
     }
 
     @Override
     public <S, E> QueryCondition notBetween(S start, E end, BiPredicate<S, E> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_BETWEEN, new Object[]{start, end}).when(isEffective.test(start, end)));
+        return notBetween(start, end, isEffective.test(start, end));
     }
 
     @Override
@@ -618,26 +606,20 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition like(Object value, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, "%" + value + "%").when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, "%" + value + "%"));
     }
 
     @Override
     public QueryCondition like(Object value, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, "%" + value + "%").when(isEffective));
+        return like(value, isEffective.getAsBoolean());
     }
 
     @Override
     public <T> QueryCondition like(T value, Predicate<T> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, "%" + value + "%").when(isEffective.test(value)));
+        return like(value, isEffective.test(value));
     }
 
     @Override
@@ -650,26 +632,20 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition likeLeft(Object value, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, value + "%").when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, value + "%"));
     }
 
     @Override
     public QueryCondition likeLeft(Object value, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, value + "%").when(isEffective));
+        return likeLeft(value, isEffective.getAsBoolean());
     }
 
     @Override
     public <T> QueryCondition likeLeft(T value, Predicate<T> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, value + "%").when(isEffective.test(value)));
+        return likeLeft(value, isEffective.test(value));
     }
 
     @Override
@@ -682,26 +658,20 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition likeRight(Object value, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, "%" + value).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, "%" + value));
     }
 
     @Override
     public QueryCondition likeRight(Object value, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, "%" + value).when(isEffective));
+        return likeRight(value, isEffective.getAsBoolean());
     }
 
     @Override
     public <T> QueryCondition likeRight(T value, Predicate<T> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, "%" + value).when(isEffective.test(value)));
+        return likeRight(value, isEffective.test(value));
     }
 
     /**
@@ -718,19 +688,16 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
      * {@code LIKE value}
      */
     public QueryCondition likeRaw(Object value, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, value).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, value));
     }
 
     /**
      * {@code LIKE value}
      */
     public QueryCondition likeRaw(Object value, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
         return likeRaw(value, isEffective.getAsBoolean());
     }
 
@@ -738,9 +705,6 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
      * {@code LIKE value}
      */
     public <T> QueryCondition likeRaw(T value, Predicate<T> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
         return likeRaw(value, isEffective.test(value));
     }
 
@@ -754,26 +718,20 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition notLike(Object value, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, "%" + value + "%").when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, "%" + value + "%"));
     }
 
     @Override
     public QueryCondition notLike(Object value, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, "%" + value + "%").when(isEffective));
+        return notLike(value, isEffective.getAsBoolean());
     }
 
     @Override
     public <T> QueryCondition notLike(T value, Predicate<T> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, "%" + value + "%").when(isEffective.test(value)));
+        return notLike(value, isEffective.test(value));
     }
 
     @Override
@@ -786,26 +744,20 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition notLikeLeft(Object value, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, value + "%").when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, value + "%"));
     }
 
     @Override
     public QueryCondition notLikeLeft(Object value, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, value + "%").when(isEffective));
+        return notLikeLeft(value, isEffective.getAsBoolean());
     }
 
     @Override
     public <T> QueryCondition notLikeLeft(T value, Predicate<T> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, value + "%").when(isEffective.test(value)));
+        return notLikeLeft(value, isEffective.test(value));
     }
 
     @Override
@@ -818,26 +770,20 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition notLikeRight(Object value, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, "%" + value).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, "%" + value));
     }
 
     @Override
     public QueryCondition notLikeRight(Object value, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, "%" + value).when(isEffective));
+        return notLikeRight(value, isEffective.getAsBoolean());
     }
 
     @Override
     public <T> QueryCondition notLikeRight(T value, Predicate<T> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, "%" + value).when(isEffective.test(value)));
+        return notLikeRight(value, isEffective.test(value));
     }
 
     /**
@@ -854,40 +800,40 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
      * {@code NOT LIKE value}
      */
     public QueryCondition notLikeRaw(Object value, boolean isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
+        if (!isEffective) {
             return QueryCondition.createEmpty();
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, value).when(isEffective));
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, value));
     }
 
     /**
      * {@code NOT LIKE value}
      */
     public QueryCondition notLikeRaw(Object value, BooleanSupplier isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return likeRaw(value, isEffective.getAsBoolean());
+        return notLikeRaw(value, isEffective.getAsBoolean());
     }
 
     /**
      * {@code NOT LIKE value}
      */
     public <T> QueryCondition notLikeRaw(T value, Predicate<T> isEffective) {
-        if (QueryColumnBehavior.shouldIgnoreValue(value)) {
-            return QueryCondition.createEmpty();
-        }
-        return likeRaw(value, isEffective.test(value));
+        return notLikeRaw(value, isEffective.test(value));
     }
 
     @Override
     public QueryCondition isNull(boolean isEffective) {
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.IS_NULL, null).when(isEffective));
+        if (!isEffective) {
+            return QueryCondition.createEmpty();
+        }
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.IS_NULL, null));
     }
 
     @Override
     public QueryCondition isNotNull(boolean isEffective) {
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.IS_NOT_NULL, null).when(isEffective));
+        if (!isEffective) {
+            return QueryCondition.createEmpty();
+        }
+        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.IS_NOT_NULL, null));
     }
 
 
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
index f58837cd..6d40bfa9 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
@@ -888,7 +888,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper eq(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).eq(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).eq(value));
+        }
         return this;
     }
 
@@ -900,7 +902,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper eq(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).eq(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).eq(value));
+        }
         return this;
     }
 
@@ -912,7 +916,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <V> QueryWrapper eq(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).eq(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).eq(value));
+        }
         return this;
     }
 
@@ -924,7 +930,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T, V> QueryWrapper eq(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).eq(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).eq(value));
+        }
         return this;
     }
 
@@ -959,7 +967,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper ne(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).ne(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).ne(value));
+        }
         return this;
     }
 
@@ -971,7 +981,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper ne(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).ne(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).ne(value));
+        }
         return this;
     }
 
@@ -983,7 +995,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <V> QueryWrapper ne(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).ne(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).ne(value));
+        }
         return this;
     }
 
@@ -995,7 +1009,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T, V> QueryWrapper ne(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).ne(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).ne(value));
+        }
         return this;
     }
 
@@ -1030,7 +1046,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper gt(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).gt(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).gt(value));
+        }
         return this;
     }
 
@@ -1042,7 +1060,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper gt(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).gt(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).gt(value));
+        }
         return this;
     }
 
@@ -1054,7 +1074,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <V> QueryWrapper gt(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).gt(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).gt(value));
+        }
         return this;
     }
 
@@ -1066,7 +1088,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T, V> QueryWrapper gt(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).gt(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).gt(value));
+        }
         return this;
     }
 
@@ -1101,7 +1125,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper ge(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).ge(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).ge(value));
+        }
         return this;
     }
 
@@ -1113,7 +1139,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper ge(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).ge(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).ge(value));
+        }
         return this;
     }
 
@@ -1125,7 +1153,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <V> QueryWrapper ge(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).ge(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).ge(value));
+        }
         return this;
     }
 
@@ -1137,7 +1167,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T, V> QueryWrapper ge(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).ge(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).ge(value));
+        }
         return this;
     }
 
@@ -1172,7 +1204,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper lt(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).lt(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).lt(value));
+        }
         return this;
     }
 
@@ -1184,7 +1218,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper lt(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).lt(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).lt(value));
+        }
         return this;
     }
 
@@ -1196,7 +1232,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <V> QueryWrapper lt(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).lt(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).lt(value));
+        }
         return this;
     }
 
@@ -1208,7 +1246,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T, V> QueryWrapper lt(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).lt(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).lt(value));
+        }
         return this;
     }
 
@@ -1243,7 +1283,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper le(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).le(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).le(value));
+        }
         return this;
     }
 
@@ -1255,7 +1297,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper le(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).le(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).le(value));
+        }
         return this;
     }
 
@@ -1267,7 +1311,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <V> QueryWrapper le(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).le(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).le(value));
+        }
         return this;
     }
 
@@ -1279,7 +1325,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T, V> QueryWrapper le(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).le(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).le(value));
+        }
         return this;
     }
 
@@ -1361,7 +1409,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param values 条件的值
      */
     public QueryWrapper in(String column, Object[] values, boolean isEffective) {
-        and(QueryMethods.column(column).in(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).in(values));
+        }
         return this;
     }
 
@@ -1372,7 +1422,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param values 值
      */
     public <T> QueryWrapper in(LambdaGetter<T> column, Object[] values, boolean isEffective) {
-        and(QueryMethods.column(column).in(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).in(values));
+        }
         return this;
     }
 
@@ -1384,7 +1436,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param values 条件的值
      */
     public QueryWrapper in(String column, Collection<?> values, boolean isEffective) {
-        and(QueryMethods.column(column).in(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).in(values));
+        }
         return this;
     }
 
@@ -1395,7 +1449,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param values 值
      */
     public <T> QueryWrapper in(LambdaGetter<T> column, Collection<?> values, boolean isEffective) {
-        and(QueryMethods.column(column).in(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).in(values));
+        }
         return this;
     }
 
@@ -1407,7 +1463,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param queryWrapper 条件的值
      */
     public QueryWrapper in(String column, QueryWrapper queryWrapper, boolean isEffective) {
-        and(QueryMethods.column(column).in(queryWrapper, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).in(queryWrapper));
+        }
         return this;
     }
 
@@ -1419,7 +1477,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param queryWrapper 值
      */
     public <T> QueryWrapper in(LambdaGetter<T> column, QueryWrapper queryWrapper, boolean isEffective) {
-        and(QueryMethods.column(column).in(queryWrapper, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).in(queryWrapper));
+        }
         return this;
     }
 
@@ -1431,7 +1491,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param queryWrapper 条件的值
      */
     public QueryWrapper in(String column, QueryWrapper queryWrapper, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).in(queryWrapper, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).in(queryWrapper));
+        }
         return this;
     }
 
@@ -1443,7 +1505,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param queryWrapper 值
      */
     public <T> QueryWrapper in(LambdaGetter<T> column, QueryWrapper queryWrapper, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).in(queryWrapper, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).in(queryWrapper));
+        }
         return this;
     }
 
@@ -1525,7 +1589,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param values 条件的值
      */
     public QueryWrapper notIn(String column, Object[] values, boolean isEffective) {
-        and(QueryMethods.column(column).notIn(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notIn(values));
+        }
         return this;
     }
 
@@ -1536,7 +1602,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param values 值
      */
     public <T> QueryWrapper notIn(LambdaGetter<T> column, Object[] values, boolean isEffective) {
-        and(QueryMethods.column(column).notIn(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notIn(values));
+        }
         return this;
     }
 
@@ -1548,7 +1616,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param values 条件的值
      */
     public QueryWrapper notIn(String column, Collection<?> values, boolean isEffective) {
-        and(QueryMethods.column(column).notIn(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notIn(values));
+        }
         return this;
     }
 
@@ -1559,7 +1629,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param values 值
      */
     public <T> QueryWrapper notIn(LambdaGetter<T> column, Collection<?> values, boolean isEffective) {
-        and(QueryMethods.column(column).notIn(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notIn(values));
+        }
         return this;
     }
 
@@ -1571,7 +1643,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param queryWrapper 条件的值
      */
     public QueryWrapper notIn(String column, QueryWrapper queryWrapper, boolean isEffective) {
-        and(QueryMethods.column(column).notIn(queryWrapper, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notIn(queryWrapper));
+        }
         return this;
     }
 
@@ -1583,7 +1657,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param queryWrapper 值
      */
     public <T> QueryWrapper notIn(LambdaGetter<T> column, QueryWrapper queryWrapper, boolean isEffective) {
-        and(QueryMethods.column(column).notIn(queryWrapper, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notIn(queryWrapper));
+        }
         return this;
     }
 
@@ -1595,7 +1671,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param queryWrapper 条件的值
      */
     public QueryWrapper notIn(String column, QueryWrapper queryWrapper, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).notIn(queryWrapper, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).notIn(queryWrapper));
+        }
         return this;
     }
 
@@ -1607,7 +1685,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param queryWrapper 值
      */
     public <T> QueryWrapper notIn(LambdaGetter<T> column, QueryWrapper queryWrapper, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).notIn(queryWrapper, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).notIn(queryWrapper));
+        }
         return this;
     }
 
@@ -1644,7 +1724,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param end    结束的值
      */
     public QueryWrapper between(String column, Object start, Object end, boolean isEffective) {
-        and(QueryMethods.column(column).between(start, end, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).between(start, end));
+        }
         return this;
     }
 
@@ -1656,7 +1738,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param end    结束的值
      */
     public <T> QueryWrapper between(LambdaGetter<T> column, Object start, Object end, boolean isEffective) {
-        and(QueryMethods.column(column).between(start, end, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).between(start, end));
+        }
         return this;
     }
 
@@ -1669,7 +1753,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param end    结束的值
      */
     public QueryWrapper between(String column, Object start, Object end, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).between(start, end, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).between(start, end));
+        }
         return this;
     }
 
@@ -1681,7 +1767,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param end    结束的值
      */
     public <T> QueryWrapper between(LambdaGetter<T> column, Object start, Object end, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).between(start, end, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).between(start, end));
+        }
         return this;
     }
 
@@ -1718,7 +1806,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param end    结束的值
      */
     public QueryWrapper notBetween(String column, Object start, Object end, boolean isEffective) {
-        and(QueryMethods.column(column).notBetween(start, end, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notBetween(start, end));
+        }
         return this;
     }
 
@@ -1730,7 +1820,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param end    结束的值
      */
     public <T> QueryWrapper notBetween(LambdaGetter<T> column, Object start, Object end, boolean isEffective) {
-        and(QueryMethods.column(column).notBetween(start, end, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notBetween(start, end));
+        }
         return this;
     }
 
@@ -1743,7 +1835,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param end    结束的值
      */
     public QueryWrapper notBetween(String column, Object start, Object end, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).notBetween(start, end, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).notBetween(start, end));
+        }
         return this;
     }
 
@@ -1755,7 +1849,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param end    结束的值
      */
     public <T> QueryWrapper notBetween(LambdaGetter<T> column, Object start, Object end, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).notBetween(start, end, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).notBetween(start, end));
+        }
         return this;
     }
 
@@ -1790,7 +1886,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper like(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).like(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).like(value));
+        }
         return this;
     }
 
@@ -1802,7 +1900,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper like(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).like(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).like(value));
+        }
         return this;
     }
 
@@ -1814,7 +1914,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <V> QueryWrapper like(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).like(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).like(value));
+        }
         return this;
     }
 
@@ -1826,7 +1928,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T, V> QueryWrapper like(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).like(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).like(value));
+        }
         return this;
     }
 
@@ -1861,7 +1965,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper likeLeft(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).likeLeft(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).likeLeft(value));
+        }
         return this;
     }
 
@@ -1873,7 +1979,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper likeLeft(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).likeLeft(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).likeLeft(value));
+        }
         return this;
     }
 
@@ -1885,7 +1993,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <V> QueryWrapper likeLeft(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).likeLeft(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).likeLeft(value));
+        }
         return this;
     }
 
@@ -1897,7 +2007,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T, V> QueryWrapper likeLeft(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).likeLeft(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).likeLeft(value));
+        }
         return this;
     }
 
@@ -1932,7 +2044,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper likeRight(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).likeRight(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).likeRight(value));
+        }
         return this;
     }
 
@@ -1944,7 +2058,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper likeRight(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).likeRight(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).likeRight(value));
+        }
         return this;
     }
 
@@ -1956,7 +2072,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <V> QueryWrapper likeRight(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).likeRight(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).likeRight(value));
+        }
         return this;
     }
 
@@ -1968,7 +2086,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T, V> QueryWrapper likeRight(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).likeRight(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).likeRight(value));
+        }
         return this;
     }
 
@@ -2003,7 +2123,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper notLike(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).notLike(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notLike(value));
+        }
         return this;
     }
 
@@ -2015,7 +2137,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper notLike(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).notLike(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notLike(value));
+        }
         return this;
     }
 
@@ -2027,7 +2151,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <V> QueryWrapper notLike(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).notLike(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).notLike(value));
+        }
         return this;
     }
 
@@ -2039,7 +2165,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T, V> QueryWrapper notLike(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).notLike(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).notLike(value));
+        }
         return this;
     }
 
@@ -2074,7 +2202,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper notLikeLeft(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).notLikeLeft(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notLikeLeft(value));
+        }
         return this;
     }
 
@@ -2086,7 +2216,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper notLikeLeft(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).notLikeLeft(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notLikeLeft(value));
+        }
         return this;
     }
 
@@ -2098,7 +2230,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <V> QueryWrapper notLikeLeft(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).notLikeLeft(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).notLikeLeft(value));
+        }
         return this;
     }
 
@@ -2110,7 +2244,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T, V> QueryWrapper notLikeLeft(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).notLikeLeft(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).notLikeLeft(value));
+        }
         return this;
     }
 
@@ -2145,7 +2281,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper notLikeRight(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).notLikeRight(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notLikeRight(value));
+        }
         return this;
     }
 
@@ -2157,7 +2295,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper notLikeRight(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).notLikeRight(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notLikeRight(value));
+        }
         return this;
     }
 
@@ -2169,7 +2309,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <V> QueryWrapper notLikeRight(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).notLikeRight(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).notLikeRight(value));
+        }
         return this;
     }
 
@@ -2181,7 +2323,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T, V> QueryWrapper notLikeRight(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).notLikeRight(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).notLikeRight(value));
+        }
         return this;
     }
 
@@ -2213,7 +2357,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper isNull(String column, boolean isEffective) {
-        and(QueryMethods.column(column).isNull(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).isNull());
+        }
         return this;
     }
 
@@ -2224,7 +2370,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper isNull(LambdaGetter<T> column, boolean isEffective) {
-        and(QueryMethods.column(column).isNull(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).isNull());
+        }
         return this;
     }
 
@@ -2235,7 +2383,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper isNull(String column, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).isNull(isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).isNull());
+        }
         return this;
     }
 
@@ -2246,7 +2396,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper isNull(LambdaGetter<T> column, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).isNull(isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).isNull());
+        }
         return this;
     }
 
@@ -2278,7 +2430,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper isNotNull(String column, boolean isEffective) {
-        and(QueryMethods.column(column).isNotNull(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).isNotNull());
+        }
         return this;
     }
 
@@ -2289,7 +2443,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper isNotNull(LambdaGetter<T> column, boolean isEffective) {
-        and(QueryMethods.column(column).isNotNull(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).isNotNull());
+        }
         return this;
     }
 
@@ -2300,7 +2456,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public QueryWrapper isNotNull(String column, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).isNotNull(isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).isNotNull());
+        }
         return this;
     }
 
@@ -2311,7 +2469,9 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
      * @param isEffective 是否有效
      */
     public <T> QueryWrapper isNotNull(LambdaGetter<T> column, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).isNotNull(isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).isNotNull());
+        }
         return this;
     }
 
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java
index e26b7d36..fdde8b7a 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java
@@ -637,7 +637,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R eq(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).eq(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).eq(value, true));
+        }
         return (R) this;
     }
 
@@ -650,7 +652,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R eq(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).eq(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).eq(value, true));
+        }
         return (R) this;
     }
 
@@ -663,7 +667,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <V> R eq(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).eq(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).eq(value, true));
+        }
         return (R) this;
     }
 
@@ -676,7 +682,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T, V> R eq(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).eq(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).eq(value, true));
+        }
         return (R) this;
     }
 
@@ -714,7 +722,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R ne(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).ne(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).ne(value, true));
+        }
         return (R) this;
     }
 
@@ -727,7 +737,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R ne(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).ne(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).ne(value, true));
+        }
         return (R) this;
     }
 
@@ -740,7 +752,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <V> R ne(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).ne(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).ne(value, true));
+        }
         return (R) this;
     }
 
@@ -753,7 +767,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T, V> R ne(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).ne(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).ne(value, true));
+        }
         return (R) this;
     }
 
@@ -791,7 +807,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R gt(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).gt(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).gt(value, true));
+        }
         return (R) this;
     }
 
@@ -804,7 +822,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R gt(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).gt(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).gt(value, true));
+        }
         return (R) this;
     }
 
@@ -817,7 +837,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <V> R gt(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).gt(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).gt(value, true));
+        }
         return (R) this;
     }
 
@@ -830,7 +852,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T, V> R gt(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).gt(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).gt(value, true));
+        }
         return (R) this;
     }
 
@@ -843,7 +867,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R ge(String column, Object value) {
-        and(QueryMethods.column(column).ge(value));
+        and(QueryMethods.column(column).ge(value, true));
         return (R) this;
     }
 
@@ -855,7 +879,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R ge(LambdaGetter<T> column, Object value) {
-        and(QueryMethods.column(column).ge(value));
+        and(QueryMethods.column(column).ge(value, true));
         return (R) this;
     }
 
@@ -868,7 +892,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R ge(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).ge(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).ge(value, true));
+        }
         return (R) this;
     }
 
@@ -881,7 +907,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R ge(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).ge(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).ge(value, true));
+        }
         return (R) this;
     }
 
@@ -894,7 +922,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <V> R ge(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).ge(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).ge(value, true));
+        }
         return (R) this;
     }
 
@@ -907,7 +937,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T, V> R ge(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).ge(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).ge(value, true));
+        }
         return (R) this;
     }
 
@@ -945,7 +977,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R lt(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).lt(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).lt(value, true));
+        }
         return (R) this;
     }
 
@@ -958,7 +992,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R lt(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).lt(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).lt(value, true));
+        }
         return (R) this;
     }
 
@@ -971,7 +1007,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <V> R lt(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).lt(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).lt(value, true));
+        }
         return (R) this;
     }
 
@@ -984,7 +1022,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T, V> R lt(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).lt(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).lt(value, true));
+        }
         return (R) this;
     }
 
@@ -1022,7 +1062,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R le(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).le(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).le(value, true));
+        }
         return (R) this;
     }
 
@@ -1035,7 +1077,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R le(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).le(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).le(value, true));
+        }
         return (R) this;
     }
 
@@ -1048,7 +1092,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <V> R le(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).le(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).le(value, true));
+        }
         return (R) this;
     }
 
@@ -1061,7 +1107,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T, V> R le(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).le(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).le(value, true));
+        }
         return (R) this;
     }
 
@@ -1074,7 +1122,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R in(String column, Object... values) {
-        and(QueryMethods.column(column).in(values));
+        and(QueryMethods.column(column).in(values, true));
         return (R) this;
     }
 
@@ -1086,7 +1134,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R in(LambdaGetter<T> column, Object... values) {
-        and(QueryMethods.column(column).in(values));
+        and(QueryMethods.column(column).in(values, true));
         return (R) this;
     }
 
@@ -1150,7 +1198,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R in(String column, Object[] values, boolean isEffective) {
-        and(QueryMethods.column(column).in(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).in(values, true));
+        }
         return (R) this;
     }
 
@@ -1162,7 +1212,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R in(LambdaGetter<T> column, Object[] values, boolean isEffective) {
-        and(QueryMethods.column(column).in(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).in(values, true));
+        }
         return (R) this;
     }
 
@@ -1175,7 +1227,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R in(String column, Collection<?> values, boolean isEffective) {
-        and(QueryMethods.column(column).in(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).in(values, true));
+        }
         return (R) this;
     }
 
@@ -1187,7 +1241,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R in(LambdaGetter<T> column, Collection<?> values, boolean isEffective) {
-        and(QueryMethods.column(column).in(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).in(values, true));
+        }
         return (R) this;
     }
 
@@ -1200,7 +1256,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R in(String column, QueryWrapper queryWrapper, boolean isEffective) {
-        and(QueryMethods.column(column).in(queryWrapper, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).in(queryWrapper, true));
+        }
         return (R) this;
     }
 
@@ -1213,7 +1271,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R in(LambdaGetter<T> column, QueryWrapper queryWrapper, boolean isEffective) {
-        and(QueryMethods.column(column).in(queryWrapper, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).in(queryWrapper, true));
+        }
         return (R) this;
     }
 
@@ -1226,7 +1286,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R in(String column, QueryWrapper queryWrapper, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).in(queryWrapper, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).in(queryWrapper, true));
+        }
         return (R) this;
     }
 
@@ -1239,7 +1301,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R in(LambdaGetter<T> column, QueryWrapper queryWrapper, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).in(queryWrapper, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).in(queryWrapper, true));
+        }
         return (R) this;
     }
 
@@ -1328,7 +1392,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R notIn(String column, Object[] values, boolean isEffective) {
-        and(QueryMethods.column(column).notIn(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notIn(values, true));
+        }
         return (R) this;
     }
 
@@ -1340,7 +1406,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R notIn(LambdaGetter<T> column, Object[] values, boolean isEffective) {
-        and(QueryMethods.column(column).notIn(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notIn(values, true));
+        }
         return (R) this;
     }
 
@@ -1353,7 +1421,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R notIn(String column, Collection<?> values, boolean isEffective) {
-        and(QueryMethods.column(column).notIn(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notIn(values, true));
+        }
         return (R) this;
     }
 
@@ -1365,7 +1435,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R notIn(LambdaGetter<T> column, Collection<?> values, boolean isEffective) {
-        and(QueryMethods.column(column).notIn(values, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notIn(values, true));
+        }
         return (R) this;
     }
 
@@ -1378,7 +1450,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R notIn(String column, QueryWrapper queryWrapper, boolean isEffective) {
-        and(QueryMethods.column(column).notIn(queryWrapper, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notIn(queryWrapper, true));
+        }
         return (R) this;
     }
 
@@ -1391,7 +1465,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R notIn(LambdaGetter<T> column, QueryWrapper queryWrapper, boolean isEffective) {
-        and(QueryMethods.column(column).notIn(queryWrapper, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notIn(queryWrapper, true));
+        }
         return (R) this;
     }
 
@@ -1404,7 +1480,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R notIn(String column, QueryWrapper queryWrapper, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).notIn(queryWrapper, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).notIn(queryWrapper, true));
+        }
         return (R) this;
     }
 
@@ -1417,7 +1495,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R notIn(LambdaGetter<T> column, QueryWrapper queryWrapper, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).notIn(queryWrapper, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).notIn(queryWrapper, true));
+        }
         return (R) this;
     }
 
@@ -1457,7 +1537,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R between(String column, Object start, Object end, boolean isEffective) {
-        and(QueryMethods.column(column).between(start, end, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).between(start, end, true));
+        }
         return (R) this;
     }
 
@@ -1470,7 +1552,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R between(LambdaGetter<T> column, Object start, Object end, boolean isEffective) {
-        and(QueryMethods.column(column).between(start, end, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).between(start, end, true));
+        }
         return (R) this;
     }
 
@@ -1484,7 +1568,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R between(String column, Object start, Object end, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).between(start, end, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).between(start, end, true));
+        }
         return (R) this;
     }
 
@@ -1497,7 +1583,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R between(LambdaGetter<T> column, Object start, Object end, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).between(start, end, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).between(start, end, true));
+        }
         return (R) this;
     }
 
@@ -1537,7 +1625,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R notBetween(String column, Object start, Object end, boolean isEffective) {
-        and(QueryMethods.column(column).notBetween(start, end, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notBetween(start, end, true));
+        }
         return (R) this;
     }
 
@@ -1550,7 +1640,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R notBetween(LambdaGetter<T> column, Object start, Object end, boolean isEffective) {
-        and(QueryMethods.column(column).notBetween(start, end, isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notBetween(start, end, true));
+        }
         return (R) this;
     }
 
@@ -1564,7 +1656,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R notBetween(String column, Object start, Object end, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).notBetween(start, end, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).notBetween(start, end, true));
+        }
         return (R) this;
     }
 
@@ -1577,7 +1671,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R notBetween(LambdaGetter<T> column, Object start, Object end, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).notBetween(start, end, isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).notBetween(start, end, true));
+        }
         return (R) this;
     }
 
@@ -1615,7 +1711,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R like(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).like(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).like(value, true));
+        }
         return (R) this;
     }
 
@@ -1628,7 +1726,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R like(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).like(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).like(value, true));
+        }
         return (R) this;
     }
 
@@ -1641,7 +1741,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <V> R like(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).like(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).like(value, true));
+        }
         return (R) this;
     }
 
@@ -1654,7 +1756,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T, V> R like(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).like(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).like(value, true));
+        }
         return (R) this;
     }
 
@@ -1692,7 +1796,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R likeLeft(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).likeLeft(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).likeLeft(value, true));
+        }
         return (R) this;
     }
 
@@ -1705,7 +1811,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R likeLeft(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).likeLeft(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).likeLeft(value, true));
+        }
         return (R) this;
     }
 
@@ -1718,7 +1826,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <V> R likeLeft(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).likeLeft(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).likeLeft(value, true));
+        }
         return (R) this;
     }
 
@@ -1731,7 +1841,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T, V> R likeLeft(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).likeLeft(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).likeLeft(value, true));
+        }
         return (R) this;
     }
 
@@ -1769,7 +1881,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R likeRight(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).likeRight(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).likeRight(value, true));
+        }
         return (R) this;
     }
 
@@ -1782,7 +1896,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R likeRight(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).likeRight(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).likeRight(value, true));
+        }
         return (R) this;
     }
 
@@ -1795,7 +1911,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <V> R likeRight(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).likeRight(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).likeRight(value, true));
+        }
         return (R) this;
     }
 
@@ -1808,7 +1926,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T, V> R likeRight(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).likeRight(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).likeRight(value, true));
+        }
         return (R) this;
     }
 
@@ -1846,7 +1966,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R notLike(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).notLike(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notLike(value, true));
+        }
         return (R) this;
     }
 
@@ -1859,7 +1981,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R notLike(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).notLike(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notLike(value, true));
+        }
         return (R) this;
     }
 
@@ -1872,7 +1996,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <V> R notLike(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).notLike(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).notLike(value, true));
+        }
         return (R) this;
     }
 
@@ -1885,7 +2011,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T, V> R notLike(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).notLike(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).notLike(value, true));
+        }
         return (R) this;
     }
 
@@ -1923,7 +2051,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R notLikeLeft(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).notLikeLeft(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notLikeLeft(value, true));
+        }
         return (R) this;
     }
 
@@ -1936,7 +2066,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R notLikeLeft(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).notLikeLeft(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notLikeLeft(value, true));
+        }
         return (R) this;
     }
 
@@ -1949,7 +2081,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <V> R notLikeLeft(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).notLikeLeft(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).notLikeLeft(value, true));
+        }
         return (R) this;
     }
 
@@ -1962,7 +2096,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T, V> R notLikeLeft(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).notLikeLeft(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).notLikeLeft(value, true));
+        }
         return (R) this;
     }
 
@@ -2000,7 +2136,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R notLikeRight(String column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).notLikeRight(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notLikeRight(value, true));
+        }
         return (R) this;
     }
 
@@ -2013,7 +2151,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R notLikeRight(LambdaGetter<T> column, Object value, boolean isEffective) {
-        and(QueryMethods.column(column).notLikeRight(value).when(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).notLikeRight(value, true));
+        }
         return (R) this;
     }
 
@@ -2026,7 +2166,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <V> R notLikeRight(String column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).notLikeRight(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).notLikeRight(value, true));
+        }
         return (R) this;
     }
 
@@ -2039,7 +2181,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T, V> R notLikeRight(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
-        and(QueryMethods.column(column).notLikeRight(value, isEffective));
+        if (isEffective.test(value)) {
+            and(QueryMethods.column(column).notLikeRight(value, true));
+        }
         return (R) this;
     }
 
@@ -2074,7 +2218,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R isNull(String column, boolean isEffective) {
-        and(QueryMethods.column(column).isNull(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).isNull());
+        }
         return (R) this;
     }
 
@@ -2086,7 +2232,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R isNull(LambdaGetter<T> column, boolean isEffective) {
-        and(QueryMethods.column(column).isNull(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).isNull());
+        }
         return (R) this;
     }
 
@@ -2098,7 +2246,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R isNull(String column, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).isNull(isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).isNull());
+        }
         return (R) this;
     }
 
@@ -2110,7 +2260,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R isNull(LambdaGetter<T> column, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).isNull(isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).isNull());
+        }
         return (R) this;
     }
 
@@ -2145,7 +2297,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R isNotNull(String column, boolean isEffective) {
-        and(QueryMethods.column(column).isNotNull(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).isNotNull());
+        }
         return (R) this;
     }
 
@@ -2157,7 +2311,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R isNotNull(LambdaGetter<T> column, boolean isEffective) {
-        and(QueryMethods.column(column).isNotNull(isEffective));
+        if (isEffective) {
+            and(QueryMethods.column(column).isNotNull());
+        }
         return (R) this;
     }
 
@@ -2169,7 +2325,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public R isNotNull(String column, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).isNotNull(isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).isNotNull());
+        }
         return (R) this;
     }
 
@@ -2181,7 +2339,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
      */
     @Override
     public <T> R isNotNull(LambdaGetter<T> column, BooleanSupplier isEffective) {
-        and(QueryMethods.column(column).isNotNull(isEffective));
+        if (isEffective.getAsBoolean()) {
+            and(QueryMethods.column(column).isNotNull());
+        }
         return (R) this;
     }