升级1.4.8

baomidou · Oct 12, 2016 · da09125 · da09125
1 parent 4ffb3ca
commit da09125
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/mybatis-plus/pom.xml b/mybatis-plus/pom.xml
@@ -31,9 +31,7 @@
 	</scm>
 
 	<properties>
-		<!-- 
 		<gpg.keyname>F4B46FB9</gpg.keyname>
-		 -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<mybatis-spring.version>1.3.0</mybatis-spring.version>
 		<mybatis.version>3.4.1</mybatis.version>
@@ -160,11 +158,9 @@
 								<goals>
 									<goal>jar</goal>
 								</goals>
-								<!-- 
 								<configuration>
 									<additionalparam>-Xdoclint:none</additionalparam>
 								</configuration>
-								 -->
 							</execution>
 						</executions>
 					</plugin>

diff --git a/mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java b/mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java
@@ -694,20 +694,22 @@ protected String convertIfTag(SqlCommandType sqlCommandType, TableFieldInfo fiel
 		if (sqlCommandType == SqlCommandType.INSERT && fieldInfo.getFieldStrategy() == FieldStrategy.FILL) {
 			return "";
 		}
-		if (fieldInfo.getFieldStrategy() == FieldStrategy.NOT_NULL) {
+		if (fieldInfo.getFieldStrategy() == FieldStrategy.IGNORED) {
+			return "";
+		} else if (fieldInfo.getFieldStrategy() == FieldStrategy.NOT_EMPTY) {
 			if (colse) {
 				return "</if>";
 			} else {
-				return String.format("\n\t<if test=\"%s!=null\">", property);
+				return String.format("\n\t<if test=\"%s!=null and %s!=''\">", property, property);
 			}
-		} else if (fieldInfo.getFieldStrategy() == FieldStrategy.NOT_EMPTY) {
+		} else {
+			//FieldStrategy.NOT_NULL
 			if (colse) {
 				return "</if>";
 			} else {
-				return String.format("\n\t<if test=\"%s!=null and %s!=''\">", property, property);
+				return String.format("\n\t<if test=\"%s!=null\">", property);
 			}
 		}
-		return "";
 	}
 
 	protected String convertIfTagInsert(TableFieldInfo fieldInfo, boolean colse) {