浏览代码

Merge pull request !5 from vector_ding/master

青苗 9 年之前
父节点
当前提交
7fa3d988bd
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java

+ 1 - 1
mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java

@@ -531,7 +531,7 @@ public class AutoSqlInjector implements ISqlInjector {
 	protected String sqlSelectColumns(TableInfo table, boolean entityWrapper) {
 	protected String sqlSelectColumns(TableInfo table, boolean entityWrapper) {
 		StringBuilder columns = new StringBuilder();
 		StringBuilder columns = new StringBuilder();
 		if (entityWrapper) {
 		if (entityWrapper) {
-			columns.append("<choose><when test=\"ew.sqlSelect != null\">${ew.sqlSelect}</when><otherwise>");
+			columns.append("<choose><when test=\"ew != null and ew.sqlSelect != null\">${ew.sqlSelect}</when><otherwise>");
 		}
 		}
 		if (table.isKeyRelated()) {
 		if (table.isKeyRelated()) {
 			columns.append(table.getKeyColumn()).append(" AS ").append(table.getKeyProperty());
 			columns.append(table.getKeyColumn()).append(" AS ").append(table.getKeyProperty());