OGNL中的and,or必须小写!解决该错误!

abel533 · abel533 · commit c47c87ee7f2a · 2015-12-17T22:32:11.000+08:00
diff --git a/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java b/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java
@@ -181,7 +181,7 @@ public static String getIfNotNull(String entityName, EntityColumn column, String
         }
         sql.append(column.getProperty()).append(" != null");
         if (empty && column.getJavaType().equals(String.class)) {
-            sql.append(" AND ");
+            sql.append(" and ");
             if (StringUtil.isNotEmpty(entityName)) {
                 sql.append(entityName).append(".");
             }
@@ -210,7 +210,7 @@ public static String getIfIsNull(String entityName, EntityColumn column, String
         }
         sql.append(column.getProperty()).append(" == null");
         if (empty && column.getJavaType().equals(String.class)) {
-            sql.append(" OR ");
+            sql.append(" or ");
             if (StringUtil.isNotEmpty(entityName)) {
                 sql.append(entityName).append(".");
             }

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ public static String getIfNotNull(String entityName, EntityColumn column, String`
`181`	`181`	`}`
`182`	`182`	`sql.append(column.getProperty()).append(" != null");`
`183`	`183`	`if (empty && column.getJavaType().equals(String.class)) {`
`184`		`- sql.append(" AND ");`
	`184`	`+ sql.append(" and ");`
`185`	`185`	`if (StringUtil.isNotEmpty(entityName)) {`
`186`	`186`	`sql.append(entityName).append(".");`
`187`	`187`	`}`
`@@ -210,7 +210,7 @@ public static String getIfIsNull(String entityName, EntityColumn column, String`
`210`	`210`	`}`
`211`	`211`	`sql.append(column.getProperty()).append(" == null");`
`212`	`212`	`if (empty && column.getJavaType().equals(String.class)) {`
`213`		`- sql.append(" OR ");`
	`213`	`+ sql.append(" or ");`
`214`	`214`	`if (StringUtil.isNotEmpty(entityName)) {`
`215`	`215`	`sql.append(entityName).append(".");`
`216`	`216`	`}`