dev-1.2.0

Author: xlorne

src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java

@@ -26,11 +26,29 @@ public QueryBuilder select(String select) {
     public class Condition {
         private List<ConditionParameter> conditions = new ArrayList<>();
 
+        public Splice notNullCondition(String conditionSql,String paramKey, Object paramVal) {
+            if(paramVal!=null) {
+                conditions.add(new ConditionParameter(paramKey, paramVal, conditionSql));
+            }else{
+                conditions.add(new ConditionParameter("1=1"));
+            }
+            return splice;
+        }
+
         public Splice condition(String conditionSql,String paramKey, Object paramVal) {
             conditions.add(new ConditionParameter(paramKey, paramVal, conditionSql));
             return splice;
         }
 
+        public Splice notNullCondition(String conditionSql,Map<String,Object> map) {
+            if(map!=null&&map.size()>0) {
+                conditions.add(new ConditionParameter(map, conditionSql));
+            }else{
+                conditions.add(new ConditionParameter("1=1"));
+            }
+            return splice;
+        }
+
         public Splice condition(String conditionSql,Map<String,Object> map) {
             conditions.add(new ConditionParameter(map, conditionSql));
             return splice;
@@ -41,15 +59,34 @@ public Splice condition(String conditionSql) {
             return splice;
         }
 
+        public Splice notNullCondition(String conditionSql,Object paramVal) {
+            if(paramVal!=null) {
+                conditions.add(new ConditionParameter(paramVal, conditionSql));
+            }else{
+                conditions.add(new ConditionParameter("1=1"));
+            }
+            return splice;
+        }
+
         public Splice condition(String conditionSql,Object paramVal) {
             conditions.add(new ConditionParameter( paramVal, conditionSql));
             return splice;
         }
 
+        public Splice notNullCondition(String conditionSql,Object... paramVal) {
+            if(paramVal!=null&&paramVal.length>0) {
+                conditions.add(new ConditionParameter(StringUtils.join(paramVal, ","), conditionSql));
+            }else{
+                conditions.add(new ConditionParameter("1=1"));
+            }
+            return splice;
+        }
+
         public Splice condition(String conditionSql,Object... paramVal) {
             conditions.add(new ConditionParameter(StringUtils.join(paramVal,","), conditionSql));
             return splice;
         }
+
     }
 
     public class Splice {

src/test/java/com/codingapi/simplemybatis/query/QueryTest.java

@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
 
 class QueryTest {
 
@@ -62,4 +63,19 @@ void queryView() throws InvocationTargetException, IllegalAccessException {
         System.out.println(sql);
     }
 
+    @Test
+    void queryNotNullView() throws InvocationTargetException, IllegalAccessException {
+        Query query = QueryBuilder.Build()
+                .select("select * from t_demo d join t_test t on d.id = t.demo_id ")
+                .where()
+                .notNullCondition("d.name1 = #{name}","123",null)
+                .or()
+                .notNullCondition("d.name2 = #{name}",new HashMap<>())
+                .builder();
+        SqlBuilder sqlBuilder = new SqlBuilder(query.getSelect(),null,query);
+        String sql = sqlBuilder.getSql();
+        System.out.println(sql);
+    }
+
+
 }