1、entitywrapper所有条件类方法支持传入null参数，该条件不会附件到SQL语句中。

2、TSQLPlus更名为TSqlPlus与整体命名保持一致。

mybatis-plus/src/main/java/com/baomidou/mybatisplus/MybatisAbstractSQL.java

@@ -1,12 +1,12 @@
 /**
  * Copyright (c) 2011-2020, hubin (jobob@qq.com).
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- *
+ * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,8 +15,11 @@
  */
 package com.baomidou.mybatisplus;
 
+import com.baomidou.mybatisplus.toolkit.StringUtils;
+
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -29,187 +32,198 @@ import java.util.List;
  */
 public abstract class MybatisAbstractSQL<T> {
 
-	private static final String AND = " AND ";
-	private static final String OR = " OR ";
-	private static final String AND_NEW = ") \nAND (";
-	private static final String OR_NEW = ") \nOR (";
-
-	/**
-	 * SQL条件
-	 */
-	private SQLCondition sql = new SQLCondition();
-
-	/**
-	 * 子类泛型实现
-	 *
-	 * @return 泛型实例
-	 */
-	public abstract T getSelf();
-
-	public T WHERE(String conditions) {
-		sql().where.add(conditions);
-		sql().lastList = sql().where;
-		return getSelf();
-	}
-
-	public T OR() {
-		sql().lastList.add(OR);
-		return getSelf();
-	}
-
-	public T OR_NEW() {
-		sql().lastList.add(OR_NEW);
-		return getSelf();
-	}
-
-	public T AND() {
-		sql().lastList.add(AND);
-		return getSelf();
-	}
-
-	public T AND_NEW() {
-		sql().lastList.add(AND_NEW);
-		return getSelf();
-	}
-
-	public T GROUP_BY(String columns) {
-		sql().groupBy.add(columns);
-		return getSelf();
-	}
-
-	public T HAVING(String conditions) {
-		sql().having.add(conditions);
-		sql().lastList = sql().having;
-		return getSelf();
-	}
-
-	public T ORDER_BY(String columns) {
-		sql().orderBy.add(columns);
-		return getSelf();
-	}
-
-	private SQLCondition sql() {
-		return sql;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sql().sql(sb);
-		return sb.toString();
-	}
-
-	/**
-	 * SQL连接器
-	 */
-	private static class SafeAppendable {
-		private final Appendable a;
-		private boolean empty = true;
-
-		public SafeAppendable(Appendable a) {
-			super();
-			this.a = a;
-		}
-
-		public SafeAppendable append(CharSequence s) {
-			try {
-				if (empty && s.length() > 0) {
-					empty = false;
-				}
-				a.append(s);
-			} catch (IOException e) {
-				throw new RuntimeException(e);
-			}
-			return this;
-		}
-
-		public boolean isEmpty() {
-			return empty;
-		}
-
-	}
-
-	/**
-	 * SQL条件类
-	 */
-	private static class SQLCondition {
-
-		List<String> where = new ArrayList<String>();
-		List<String> having = new ArrayList<String>();
-		List<String> groupBy = new ArrayList<String>();
-		List<String> orderBy = new ArrayList<String>();
-		List<String> lastList = new ArrayList<String>();
-		List<String> andOr = new ArrayList<String>();
-
-		public SQLCondition() {
-			andOr.add(AND);
-			andOr.add(OR);
-			andOr.add(AND_NEW);
-			andOr.add(OR_NEW);
-		}
-
-		/**
-		 * 构建SQL的条件
-		 *
-		 * @param builder
-		 *            连接器
-		 * @param keyword
-		 *            TSQL中的关键字
-		 * @param parts
-		 *            SQL条件语句集合
-		 * @param open
-		 *            起始符号
-		 * @param close
-		 *            结束符号
-		 * @param conjunction
-		 *            连接条件
-		 */
-		private void sqlClause(SafeAppendable builder, String keyword, List<String> parts, String open, String close,
-				String conjunction) {
-			if (!parts.isEmpty()) {
-				if (!builder.isEmpty()) {
-					builder.append("\n");
-				}
-
-				builder.append(keyword);
-				builder.append(" ");
-				builder.append(open);
-				String last = "__";
-				for (int i = 0, n = parts.size(); i < n; i++) {
-					String part = parts.get(i);
-					if (i > 0) {
-						if (andOr.contains(part) || andOr.contains(last)) {
-							builder.append(part);
-							last = part;
-							continue;
-						} else {
-							builder.append(conjunction);
-						}
-					}
-					builder.append(part);
-				}
-				builder.append(close);
-			}
-		}
-
-		/**
-		 * 按标准顺序连接并构建SQL
-		 *
-		 * @param builder
-		 *            连接器
-		 * @return
-		 */
-		private String buildSQL(SafeAppendable builder) {
-			sqlClause(builder, "WHERE", where, "(", ")", AND);
-			sqlClause(builder, "GROUP BY", groupBy, "", "", ", ");
-			sqlClause(builder, "HAVING", having, "(", ")", AND);
-			sqlClause(builder, "ORDER BY", orderBy, "", "", ", ");
-			return builder.toString();
-		}
-
-		public String sql(Appendable a) {
-			SafeAppendable builder = new SafeAppendable(a);
-			return buildSQL(builder);
-		}
-	}
+    private static final String AND = " AND ";
+    private static final String OR = " OR ";
+    private static final String AND_NEW = ") \nAND (";
+    private static final String OR_NEW = ") \nOR (";
+
+    /**
+     * SQL条件
+     */
+    private SQLCondition sql = new SQLCondition();
+
+    /**
+     * 子类泛型实现
+     *
+     * @return 泛型实例
+     */
+    public abstract T getSelf();
+
+    public T WHERE(String conditions) {
+        sql().where.add(conditions);
+        sql().lastList = sql().where;
+        return getSelf();
+    }
+
+    public T OR() {
+        sql().lastList.add(OR);
+        return getSelf();
+    }
+
+    public T OR_NEW() {
+        sql().lastList.add(OR_NEW);
+        return getSelf();
+    }
+
+    public T AND() {
+        sql().lastList.add(AND);
+        return getSelf();
+    }
+
+    public T AND_NEW() {
+        sql().lastList.add(AND_NEW);
+        return getSelf();
+    }
+
+    public T GROUP_BY(String columns) {
+        sql().groupBy.add(columns);
+        return getSelf();
+    }
+
+    public T HAVING(String conditions) {
+        sql().having.add(conditions);
+        sql().lastList = sql().having;
+        return getSelf();
+    }
+
+    public T ORDER_BY(String columns) {
+        sql().orderBy.add(columns);
+        return getSelf();
+    }
+
+    private SQLCondition sql() {
+        return sql;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sql().sql(sb);
+        return sb.toString();
+    }
+
+    /**
+     * SQL连接器
+     */
+    private static class SafeAppendable {
+        private final Appendable a;
+        private boolean empty = true;
+
+        public SafeAppendable(Appendable a) {
+            super();
+            this.a = a;
+        }
+
+        public SafeAppendable append(CharSequence s) {
+            try {
+                if (empty && s.length() > 0) {
+                    empty = false;
+                }
+                a.append(s);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            return this;
+        }
+
+        public boolean isEmpty() {
+            return empty;
+        }
+
+    }
+
+    /**
+     * SQL条件类
+     */
+    private static class SQLCondition {
+
+        List<String> where = new ArrayList<String>();
+        List<String> having = new ArrayList<String>();
+        List<String> groupBy = new ArrayList<String>();
+        List<String> orderBy = new ArrayList<String>();
+        List<String> lastList = new ArrayList<String>();
+        List<String> andOr = new ArrayList<String>();
+
+        public SQLCondition() {
+            andOr.add(AND);
+            andOr.add(OR);
+            andOr.add(AND_NEW);
+            andOr.add(OR_NEW);
+        }
+
+        /**
+         * 构建SQL的条件
+         *
+         * @param builder     连接器
+         * @param keyword     TSQL中的关键字
+         * @param parts       SQL条件语句集合
+         * @param open        起始符号
+         * @param close       结束符号
+         * @param conjunction 连接条件
+         */
+        private void sqlClause(SafeAppendable builder, String keyword, List<String> parts, String open, String close,
+                               String conjunction) {
+            parts = clearNull(parts);
+            if (!parts.isEmpty()) {
+                if (!builder.isEmpty()) {
+                    builder.append("\n");
+                }
+
+                builder.append(keyword);
+                builder.append(" ");
+                builder.append(open);
+                String last = "__";
+                for (int i = 0, n = parts.size(); i < n; i++) {
+                    String part = parts.get(i);
+                    if (i > 0) {
+                        if (andOr.contains(part) || andOr.contains(last)) {
+                            builder.append(part);
+                            last = part;
+                            continue;
+                        } else {
+                            builder.append(conjunction);
+                        }
+                    }
+                    builder.append(part);
+                }
+                builder.append(close);
+            }
+        }
+
+        /**
+         * 清除LIST中的NULL和空字符串
+         *
+         * @param parts 原LIST列表
+         * @return
+         */
+        private List<String> clearNull(List<String> parts) {
+            List<String> temps = new ArrayList<String>();
+            for (String part : parts) {
+                if (StringUtils.isEmpty(part)) {
+                    continue;
+                }
+                temps.add(part);
+            }
+            return temps;
+        }
+
+        /**
+         * 按标准顺序连接并构建SQL
+         *
+         * @param builder 连接器
+         * @return
+         */
+        private String buildSQL(SafeAppendable builder) {
+            sqlClause(builder, "WHERE", where, "(", ")", AND);
+            sqlClause(builder, "GROUP BY", groupBy, "", "", ", ");
+            sqlClause(builder, "HAVING", having, "(", ")", AND);
+            sqlClause(builder, "ORDER BY", orderBy, "", "", ", ");
+            return builder.toString();
+        }
+
+        public String sql(Appendable a) {
+            SafeAppendable builder = new SafeAppendable(a);
+            return buildSQL(builder);
+        }
+    }
 }

mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/EntityWrapper.java

@@ -29,397 +29,342 @@ import com.baomidou.mybatisplus.toolkit.StringUtils;
  */
 public class EntityWrapper<T> {
 
-	/**
-	 * 数据库表映射实体类
-	 */
-	protected T entity = null;
-
-	/**
-	 * SQL 查询字段内容，例如：id,name,age
-	 */
-	protected String sqlSelect = null;
-
-	/**
-	 * 实现了TSQL语法的SQL实体
-	 */
-	protected TSQLPlus sql = new TSQLPlus();
-
-	public EntityWrapper() {
-		/* 注意，传入查询参数 */
-	}
-
-	public EntityWrapper(T entity) {
-		this.entity = entity;
-	}
-
-	public EntityWrapper(T entity, String sqlSelect) {
-		this.entity = entity;
-		this.sqlSelect = sqlSelect;
-	}
-
-	public T getEntity() {
-		return entity;
-	}
-
-	public void setEntity(T entity) {
-		this.entity = entity;
-	}
-
-	public String getSqlSelect() {
-		if (StringUtils.isEmpty(sqlSelect)) {
-			return null;
-		}
-		return stripSqlInjection(sqlSelect);
-	}
-
-	public void setSqlSelect(String sqlSelect) {
-		if (StringUtils.isNotEmpty(sqlSelect)) {
-			this.sqlSelect = sqlSelect;
-		}
-	}
-
-	/**
-	 * SQL 片段
-	 */
-	public String getSqlSegment() {
-		/*
-		 * 无条件
+    /**
+     * 数据库表映射实体类
+     */
+    protected T entity = null;
+
+    /**
+     * SQL 查询字段内容，例如：id,name,age
+     */
+    protected String sqlSelect = null;
+
+    /**
+     * 实现了TSQL语法的SQL实体
+     */
+    protected TSqlPlus sql = new TSqlPlus();
+
+    public EntityWrapper() {
+        /* 注意，传入查询参数 */
+    }
+
+    public EntityWrapper(T entity) {
+        this.entity = entity;
+    }
+
+    public EntityWrapper(T entity, String sqlSelect) {
+        this.entity = entity;
+        this.sqlSelect = sqlSelect;
+    }
+
+    public T getEntity() {
+        return entity;
+    }
+
+    public void setEntity(T entity) {
+        this.entity = entity;
+    }
+
+    public String getSqlSelect() {
+        if (StringUtils.isEmpty(sqlSelect)) {
+            return null;
+        }
+        return stripSqlInjection(sqlSelect);
+    }
+
+    public void setSqlSelect(String sqlSelect) {
+        if (StringUtils.isNotEmpty(sqlSelect)) {
+            this.sqlSelect = sqlSelect;
+        }
+    }
+
+    /**
+     * SQL 片段
+     */
+    public String getSqlSegment() {
+        /*
+         * 无条件
 		 */
-		String sqlWhere = sql.toString();
-		if (StringUtils.isEmpty(sqlWhere)) {
-			return null;
-		}
+        String sqlWhere = sql.toString();
+        if (StringUtils.isEmpty(sqlWhere)) {
+            return null;
+        }
 
-		// 根据当前实体判断是否需要将WHERE替换成AND
-		sqlWhere = (null != entity) ? sqlWhere.replaceFirst("WHERE", "AND") : sqlWhere;
+        // 根据当前实体判断是否需要将WHERE替换成AND
+        sqlWhere = (null != entity) ? sqlWhere.replaceFirst("WHERE", "AND") : sqlWhere;
 
 		/*
-		 * 使用防SQL注入处理后返回
+         * 使用防SQL注入处理后返回
 		 */
-		return stripSqlInjection(sqlWhere);
-	}
-
-	/**
-	 * <p>
-	 * SQL中WHERE关键字跟的条件语句
-	 * </p>
-	 * <p>
-	 * eg: ew.where("name='zhangsan'").where("id={0}","123");
-	 * <p>
-	 * 输出: WHERE (NAME='zhangsan' AND id=123)
-	 * </p>
-	 *
-	 * @param sqlWhere
-	 *            where语句
-	 * @param params
-	 *            参数集
-	 * @return this
-	 */
-	public EntityWrapper<T> where(String sqlWhere, Object... params) {
-		String sqlPart = formatSql(sqlWhere, params);
-		if (retNeed(sqlPart)) {
-			sql.WHERE(sqlPart);
-		}
-		return this;
-	}
-
-	/**
-	 * <p>
-	 * AND 连接后续条件
-	 * </p>
-	 *
-	 * @param sqlAnd
-	 *            and条件语句
-	 * @param params
-	 *            参数集
-	 * @return this
-	 */
-	public EntityWrapper<T> and(String sqlAnd, Object... params) {
-		return where(sqlAnd, params);
-	}
-
-	/**
-	 * <p>
-	 * 使用AND连接并换行
-	 * </p>
-	 * <p>
-	 * eg: ew.where("name='zhangsan'").and("id=11").andNew("statu=1"); 输出： WHERE
-	 * (name='zhangsan' AND id=11) AND (statu=1)
-	 * </p>
-	 *
-	 * @param sqlAnd
-	 *            AND 条件语句
-	 * @param params
-	 *            参数值
-	 * @return this
-	 */
-	public EntityWrapper<T> andNew(String sqlAnd, Object... params) {
-		String sqlPart = formatSql(sqlAnd, params);
-		if (retNeed(sqlPart)) {
-			sql.AND_NEW().WHERE(sqlPart);
-		}
-		return this;
-	}
-
-	/**
-	 * <p>
-	 * 添加OR条件
-	 * </p>
-	 *
-	 * @param sqlOr
-	 *            or 条件语句
-	 * @param params
-	 *            参数集
-	 * @return
-	 */
-	public EntityWrapper<T> or(String sqlOr, Object... params) {
-		String sqlPart = formatSql(sqlOr, params);
-		if (retNeed(sqlPart)) {
-			sql.OR().WHERE(sqlPart);
-		}
-		return this;
-	}
-
-	/**
-	 * <p>
-	 * 使用OR换行，并添加一个带()的新的条件
-	 * </p>
-	 * <p>
-	 * eg: ew.where("name='zhangsan'").and("id=11").orNew("statu=1"); 输出： WHERE
-	 * (name='zhangsan' AND id=11) OR (statu=1)
-	 * </p>
-	 *
-	 * @param sqlOr
-	 *            AND 条件语句
-	 * @param params
-	 *            参数值
-	 * @return this
-	 */
-	public EntityWrapper<T> orNew(String sqlOr, Object... params) {
-		String sqlPart = formatSql(sqlOr, params);
-		if (retNeed(sqlPart)) {
-			sql.OR_NEW().WHERE(sqlPart);
-		}
-		return this;
-	}
-
-	/**
-	 * <p>
-	 * SQL中groupBy关键字跟的条件语句
-	 * </p>
-	 * <p>
-	 * eg: ew.where("name='zhangsan'").groupBy("id,name")
-	 * </p>
-	 *
-	 * @param columns
-	 *            SQL 中的 Group by 语句，无需输入 Group By 关键字
-	 * @return this
-	 */
-	public EntityWrapper<T> groupBy(String columns) {
-		sql.GROUP_BY(columns);
-		return this;
-	}
-
-	/**
-	 * <p>
-	 * SQL中having关键字跟的条件语句
-	 * </p>
-	 * <p>
-	 * eg: ew.groupBy("id,name").having("id={0}",22).and("password is not null")
-	 * </p>
-	 *
-	 * @param sqlHaving
-	 *            having关键字后面跟随的语句
-	 * @param params
-	 *            参数集
-	 * @return EntityWrapper
-	 */
-	public EntityWrapper<T> having(String sqlHaving, Object... params) {
-		String sqlPart = formatSql(sqlHaving, params);
-		if (retNeed(sqlPart)) {
-			sql.HAVING(sqlPart);
-		}
-		return this;
-	}
-
-	/**
-	 * <p>
-	 * SQL中orderby关键字跟的条件语句
-	 * </p>
-	 * <p>
-	 * eg: ew.groupBy("id,name").having("id={0}",22).and("password is not null"
-	 * ).orderBy("id,name")
-	 * </p>
-	 *
-	 * @param columns
-	 *            SQL 中的 order by 语句，无需输入 Order By 关键字
-	 * @return this
-	 */
-	public EntityWrapper<T> orderBy(String columns) {
-		sql.ORDER_BY(columns);
-		return this;
-	}
-
-	/**
-	 * <p>
-	 * SQL中orderby关键字跟的条件语句，可根据变更动态排序
-	 * </p>
-	 *
-	 * @param columns
-	 *            SQL 中的 order by 语句，无需输入 Order By 关键字
-	 * @param isAsc
-	 *            是否为升序
-	 * @return
-	 */
-	public EntityWrapper<T> orderBy(String columns, boolean isAsc) {
-		sql.ORDER_BY(columns + (isAsc ? " ASC" : " DESC"));
-		return this;
-	}
-
-	/**
-	 * LIKE条件语句，value中无需前后% 目前适配mysql及oracle
-	 *
-	 * @param column
-	 *            字段名称
-	 * @param value
-	 *            匹配值
-	 * @return
-	 */
-	public EntityWrapper<T> like(String column, String value) {
-		sql.LIKE(column, value);
-		return this;
-	}
-
-	/**
-	 * NOT LIKE条件语句，value中无需前后% 目前适配mysql及oracle
-	 *
-	 * @param column
-	 *            字段名称
-	 * @param value
-	 *            匹配值
-	 * @return
-	 */
-	public EntityWrapper<T> notLike(String column, String value) {
-		sql.NOT_LIKE(column, value);
-		return this;
-	}
-
-	/**
-	 * is not null 条件
-	 *
-	 * @param columns
-	 *            字段名称。多个字段以逗号分隔。
-	 * @return
-	 */
-	public EntityWrapper<T> isNotNull(String columns) {
-		sql.IS_NOT_NULL(columns);
-		return this;
-	}
-
-	/**
-	 * is not null 条件
-	 *
-	 * @param columns
-	 *            字段名称。多个字段以逗号分隔。
-	 * @return
-	 */
-	public EntityWrapper<T> isNull(String columns) {
-		sql.IS_NULL(columns);
-		return this;
-	}
-
-	/**
-	 * 为了兼容之前的版本,可使用where()或and()替代
-	 *
-	 * @param sqlWhere
-	 *            where sql部分
-	 * @param params
-	 *            参数集
-	 * @return this
-	 */
-	public EntityWrapper<T> addFilter(String sqlWhere, Object... params) {
-		return and(sqlWhere, params);
-	}
-
-	/**
-	 * <p>
-	 * 根据判断条件来添加条件语句部分 使用 andIf() 替代
-	 * </p>
-	 * <p>
-	 * eg: ew.filterIfNeed(false,"name='zhangsan'").where("name='zhangsan'")
-	 * .filterIfNeed(true,"id={0}",22)
-	 * <p>
-	 * 输出: WHERE (name='zhangsan' AND id=22)
-	 * </p>
-	 *
-	 * @param need
-	 *            是否需要添加该条件
-	 * @param sqlWhere
-	 *            条件语句
-	 * @param params
-	 *            参数集
-	 * @return this
-	 */
-	public EntityWrapper<T> addFilterIfNeed(boolean need, String sqlWhere, Object... params) {
-		return need ? where(sqlWhere, params) : this;
-	}
-
-	/**
-	 * <p>
-	 * SQL注入内容剥离
-	 * </p>
-	 *
-	 * @param value
-	 *            待处理内容
-	 * @return
-	 */
-	protected String stripSqlInjection(String value) {
-		return value.replaceAll("('.+--)|(--)|(\\|)|(%7C)", "");
-	}
-
-	/**
-	 * formatSql的结果如果返回NULL,就会产生WHERE(NULL) 这样的结果 所以此处要判断后，根据结果来添加当前关键字处理
-	 *
-	 * @param sqlPart
-	 *            当前SQL语句
-	 * @return boolean
-	 */
-	protected boolean retNeed(String sqlPart) {
-		return StringUtils.isNotEmpty(sqlPart);
-	}
-
-	/**
-	 * 格式化SQL
-	 *
-	 * @param sqlStr
-	 *            SQL语句部分
-	 * @param params
-	 *            参数集
-	 * @return
-	 */
-	protected String formatSql(String sqlStr, Object... params) {
-		return formatSqlIfNeed(true, sqlStr, params);
-	}
-
-	/**
-	 * 根据需要格式化SQL
-	 *
-	 * @param need
-	 *            是否需要格式化
-	 * @param sqlStr
-	 *            SQL语句部分
-	 * @param params
-	 *            参数集
-	 * @return
-	 */
-	protected String formatSqlIfNeed(boolean need, String sqlStr, Object... params) {
-		if (!need || StringUtils.isEmpty(sqlStr)) {
-			return null;
-		}
-		if (null != params && params.length > 0) {
-			sqlStr = MessageFormat.format(sqlStr, params);
-		}
-		return sqlStr;
-	}
+        return stripSqlInjection(sqlWhere);
+    }
+
+    /**
+     * <p>
+     * SQL中WHERE关键字跟的条件语句
+     * </p>
+     * <p>
+     * eg: ew.where("name='zhangsan'").where("id={0}","123");
+     * <p>
+     * 输出: WHERE (NAME='zhangsan' AND id=123)
+     * </p>
+     *
+     * @param sqlWhere where语句
+     * @param params   参数集
+     * @return this
+     */
+    public EntityWrapper<T> where(String sqlWhere, Object... params) {
+        sql.WHERE(formatSql(sqlWhere, params));
+        return this;
+    }
+
+    /**
+     * <p>
+     * AND 连接后续条件
+     * </p>
+     *
+     * @param sqlAnd and条件语句
+     * @param params 参数集
+     * @return this
+     */
+    public EntityWrapper<T> and(String sqlAnd, Object... params) {
+        sql.AND().WHERE(formatSql(sqlAnd, params));
+        return this;
+    }
+
+    /**
+     * <p>
+     * 使用AND连接并换行
+     * </p>
+     * <p>
+     * eg: ew.where("name='zhangsan'").and("id=11").andNew("statu=1"); 输出： WHERE
+     * (name='zhangsan' AND id=11) AND (statu=1)
+     * </p>
+     *
+     * @param sqlAnd AND 条件语句
+     * @param params 参数值
+     * @return this
+     */
+    public EntityWrapper<T> andNew(String sqlAnd, Object... params) {
+        sql.AND_NEW().WHERE(formatSql(sqlAnd, params));
+        return this;
+    }
+
+    /**
+     * <p>
+     * 添加OR条件
+     * </p>
+     *
+     * @param sqlOr  or 条件语句
+     * @param params 参数集
+     * @return this
+     */
+    public EntityWrapper<T> or(String sqlOr, Object... params) {
+        sql.OR().WHERE(formatSql(sqlOr, params));
+        return this;
+    }
+
+    /**
+     * <p>
+     * 使用OR换行，并添加一个带()的新的条件
+     * </p>
+     * <p>
+     * eg: ew.where("name='zhangsan'").and("id=11").orNew("statu=1"); 输出： WHERE
+     * (name='zhangsan' AND id=11) OR (statu=1)
+     * </p>
+     *
+     * @param sqlOr  AND 条件语句
+     * @param params 参数值
+     * @return this
+     */
+    public EntityWrapper<T> orNew(String sqlOr, Object... params) {
+        sql.OR_NEW().WHERE(formatSql(sqlOr, params));
+        return this;
+    }
+
+    /**
+     * <p>
+     * SQL中groupBy关键字跟的条件语句
+     * </p>
+     * <p>
+     * eg: ew.where("name='zhangsan'").groupBy("id,name")
+     * </p>
+     *
+     * @param columns SQL 中的 Group by 语句，无需输入 Group By 关键字
+     * @return this
+     */
+    public EntityWrapper<T> groupBy(String columns) {
+        sql.GROUP_BY(columns);
+        return this;
+    }
+
+    /**
+     * <p>
+     * SQL中having关键字跟的条件语句
+     * </p>
+     * <p>
+     * eg: ew.groupBy("id,name").having("id={0}",22).and("password is not null")
+     * </p>
+     *
+     * @param sqlHaving having关键字后面跟随的语句
+     * @param params    参数集
+     * @return EntityWrapper
+     */
+    public EntityWrapper<T> having(String sqlHaving, Object... params) {
+        sql.HAVING(formatSql(sqlHaving, params));
+        return this;
+    }
+
+    /**
+     * <p>
+     * SQL中orderby关键字跟的条件语句
+     * </p>
+     * <p>
+     * eg: ew.groupBy("id,name").having("id={0}",22).and("password is not null"
+     * ).orderBy("id,name")
+     * </p>
+     *
+     * @param columns SQL 中的 order by 语句，无需输入 Order By 关键字
+     * @return this
+     */
+    public EntityWrapper<T> orderBy(String columns) {
+        sql.ORDER_BY(columns);
+        return this;
+    }
+
+    /**
+     * <p>
+     * SQL中orderby关键字跟的条件语句，可根据变更动态排序
+     * </p>
+     *
+     * @param columns SQL 中的 order by 语句，无需输入 Order By 关键字
+     * @param isAsc   是否为升序
+     * @return this
+     */
+    public EntityWrapper<T> orderBy(String columns, boolean isAsc) {
+        if (StringUtils.isNotEmpty(columns)) {
+            sql.ORDER_BY(columns + (isAsc ? " ASC" : " DESC"));
+        }
+        return this;
+    }
+
+    /**
+     * LIKE条件语句，value中无需前后% 目前适配mysql及oracle
+     *
+     * @param column 字段名称
+     * @param value  匹配值
+     * @return this
+     */
+    public EntityWrapper<T> like(String column, String value) {
+        sql.LIKE(column, value);
+        return this;
+    }
+
+    /**
+     * NOT LIKE条件语句，value中无需前后% 目前适配mysql及oracle
+     *
+     * @param column 字段名称
+     * @param value  匹配值
+     * @return this
+     */
+    public EntityWrapper<T> notLike(String column, String value) {
+        sql.NOT_LIKE(column, value);
+        return this;
+    }
+
+    /**
+     * is not null 条件
+     *
+     * @param columns 字段名称。多个字段以逗号分隔。
+     * @return this
+     */
+    public EntityWrapper<T> isNotNull(String columns) {
+        sql.IS_NOT_NULL(columns);
+        return this;
+    }
+
+    /**
+     * is not null 条件
+     *
+     * @param columns 字段名称。多个字段以逗号分隔。
+     * @return this
+     */
+    public EntityWrapper<T> isNull(String columns) {
+        sql.IS_NULL(columns);
+        return this;
+    }
+
+    /**
+     * 为了兼容之前的版本,可使用where()或and()替代
+     *
+     * @param sqlWhere where sql部分
+     * @param params   参数集
+     * @return this
+     */
+    public EntityWrapper<T> addFilter(String sqlWhere, Object... params) {
+        return and(sqlWhere, params);
+    }
+
+    /**
+     * <p>
+     * 根据判断条件来添加条件语句部分 使用 andIf() 替代
+     * </p>
+     * <p>
+     * eg: ew.filterIfNeed(false,"name='zhangsan'").where("name='zhangsan'")
+     * .filterIfNeed(true,"id={0}",22)
+     * <p>
+     * 输出: WHERE (name='zhangsan' AND id=22)
+     * </p>
+     *
+     * @param need     是否需要添加该条件
+     * @param sqlWhere 条件语句
+     * @param params   参数集
+     * @return this
+     */
+    public EntityWrapper<T> addFilterIfNeed(boolean need, String sqlWhere, Object... params) {
+        return need ? where(sqlWhere, params) : this;
+    }
+
+    /**
+     * <p>
+     * SQL注入内容剥离
+     * </p>
+     *
+     * @param value 待处理内容
+     * @return this
+     */
+    protected String stripSqlInjection(String value) {
+        return value.replaceAll("('.+--)|(--)|(\\|)|(%7C)", "");
+    }
+
+
+    /**
+     * 格式化SQL
+     *
+     * @param sqlStr SQL语句部分
+     * @param params 参数集
+     * @return this
+     */
+    protected String formatSql(String sqlStr, Object... params) {
+        return formatSqlIfNeed(true, sqlStr, params);
+    }
+
+    /**
+     * 根据需要格式化SQL
+     *
+     * @param need   是否需要格式化
+     * @param sqlStr SQL语句部分
+     * @param params 参数集
+     * @return this
+     */
+    protected String formatSqlIfNeed(boolean need, String sqlStr, Object... params) {
+        if (!need || StringUtils.isEmpty(sqlStr)) {
+            return null;
+        }
+        if (null != params && params.length > 0) {
+            sqlStr = MessageFormat.format(sqlStr, params);
+        }
+        return sqlStr;
+    }
 
 }

mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/TSQLPlus.java → mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/TSqlPlus.java

@@ -28,13 +28,13 @@ import java.text.MessageFormat;
  * @author yanghu
  * @Date 2016-08-22
  */
-public class TSQLPlus extends MybatisAbstractSQL<TSQLPlus> {
+public class TSqlPlus extends MybatisAbstractSQL<TSqlPlus> {
 
 	private final String IS_NOT_NULL = " IS NOT NULL";
 	private final String IS_NULL = " IS NULL";
 
 	@Override
-	public TSQLPlus getSelf() {
+	public TSqlPlus getSelf() {
 		return this;
 	}
 
@@ -47,7 +47,7 @@ public class TSQLPlus extends MybatisAbstractSQL<TSQLPlus> {
 	 *            like值,无需前后%, MYSQL及ORACEL通用
 	 * @return
 	 */
-	public TSQLPlus LIKE(String column, String value) {
+	public TSqlPlus LIKE(String column, String value) {
 		handerLike(column, value, false);
 		return this;
 	}
@@ -61,7 +61,7 @@ public class TSQLPlus extends MybatisAbstractSQL<TSQLPlus> {
 	 *            like值,无需前后%, MYSQL及ORACEL通用
 	 * @return
 	 */
-	public TSQLPlus NOT_LIKE(String column, String value) {
+	public TSqlPlus NOT_LIKE(String column, String value) {
 		handerLike(column, value, true);
 		return this;
 	}
@@ -73,7 +73,7 @@ public class TSQLPlus extends MybatisAbstractSQL<TSQLPlus> {
 	 *            以逗号分隔的字段名称
 	 * @return this
 	 */
-	public TSQLPlus IS_NOT_NULL(String columns) {
+	public TSqlPlus IS_NOT_NULL(String columns) {
 		handerNull(columns, IS_NOT_NULL);
 		return this;
 	}
@@ -85,7 +85,7 @@ public class TSQLPlus extends MybatisAbstractSQL<TSQLPlus> {
 	 *            以逗号分隔的字段名称
 	 * @return
 	 */
-	public TSQLPlus IS_NULL(String columns) {
+	public TSqlPlus IS_NULL(String columns) {
 		handerNull(columns, IS_NULL);
 		return this;
 	}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/EntityWrapperTest.java

@@ -15,12 +15,17 @@
  */
 package com.baomidou.mybatisplus.test;
 
+import com.baomidou.mybatisplus.toolkit.StringUtils;
+import com.sun.deploy.util.ArrayUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.test.mysql.entity.User;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 条件查询测试
@@ -141,7 +146,7 @@ public class EntityWrapperTest {
         ew.setEntity(new User(1));
         ew.where("name={0}", "'zhangsan'").and("id=1")
                 .orNew("status={0}", "0").or("status=1")
-                .notLike("nlike","notvalue")
+                .notLike("nlike", "notvalue")
                 .andNew("new=xx").like("hhh", "ddd")
                 .andNew("pwd=11").isNotNull("n1,n2").isNull("n3")
                 .groupBy("x1").groupBy("x2,x3")
@@ -149,4 +154,19 @@ public class EntityWrapperTest {
                 .orderBy("dd").orderBy("d1,d2");
         System.out.println(ew.getSqlSegment());
     }
+
+    @Test
+    public void testNull() {
+        ew.orderBy(null);
+        String sqlPart = ew.getSqlSegment();
+        Assert.assertNull(sqlPart);
+    }
+
+    @Test
+    public void testNull2() {
+        ew.like(null, null).where("aa={0}", "'bb'").orderBy(null);
+        String sqlPart = ew.getSqlSegment();
+        Assert.assertEquals("WHERE (aa='bb')", sqlPart);
+    }
+
 }