Browse Source

add 1.4.8 data to ar

jobob 8 years ago
parent
commit
19dbf024eb

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

@@ -699,20 +699,22 @@ public class AutoSqlInjector implements ISqlInjector {
 		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) {