Przeglądaj źródła

fixed github issues/300

hubin 7 lat temu
rodzic
commit
0d228a345a

+ 1 - 1
build.gradle

@@ -7,7 +7,7 @@ ext {
         mybatisSpringVersion = '1.3.2',
         mybatisSpringVersion = '1.3.2',
         mybatisVersion = '3.4.6',
         mybatisVersion = '3.4.6',
         springVersion = '4.3.5.RELEASE',
         springVersion = '4.3.5.RELEASE',
-        springBootVersion = '2.0.1.RELEASE',
+        springBootVersion = '1.5.12.RELEASE',
     ]
     ]
 
 
     dependencies = [
     dependencies = [

+ 2 - 3
mybatis-plus-support/src/main/java/com/baomidou/mybatisplus/entity/TableFieldInfo.java

@@ -119,10 +119,9 @@ public class TableFieldInfo {
         }
         }
         this.el = el;
         this.el = el;
         /*
         /*
-         * 优先使用单个字段注解,否则使用全局配置<br>
-         * 自定义字段验证策略 fixed-239
+         * 优先使用单个字段注解,否则使用全局配置
 		 */
 		 */
-        if (FieldStrategy.NOT_NULL != tableField.strategy()) {
+        if (globalConfig.getFieldStrategy() != tableField.strategy()) {
             this.fieldStrategy = tableField.strategy();
             this.fieldStrategy = tableField.strategy();
         } else {
         } else {
             this.fieldStrategy = globalConfig.getFieldStrategy();
             this.fieldStrategy = globalConfig.getFieldStrategy();