miemie 5 years ago
parent
commit
d6f7148fd8

+ 4 - 21
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/handlers/StrictFill.java

@@ -15,10 +15,8 @@
  */
 package com.baomidou.mybatisplus.core.handlers;
 
-import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.Getter;
 
 import java.util.function.Supplier;
 
@@ -39,31 +37,16 @@ public class StrictFill {
      * 字段类型
      */
     private Class<?> fieldType;
-    /**
-     * 字段值
-     */
-    private Object fieldVal;
     /**
      * 获取字段值的函数
      */
-    @Getter(AccessLevel.NONE)
-    private Supplier<Object> fieldValSupplier;
+    private Supplier<Object> fieldVal;
 
     public static StrictFill of(String fieldName, Class<?> fieldType, Object fieldVal) {
-        return new StrictFill(fieldName, fieldType, fieldVal, null);
-    }
-
-    public static StrictFill of(String fieldName, Class<?> fieldType, Supplier<Object> fieldValSupplier) {
-        return new StrictFill(fieldName, fieldType, null, fieldValSupplier);
+        return new StrictFill(fieldName, fieldType, () -> fieldVal);
     }
 
-    Supplier<Object> getFieldVal() {
-        if (fieldVal != null) {
-            return () -> fieldVal;
-        }
-        if (fieldValSupplier != null) {
-            return fieldValSupplier;
-        }
-        return () -> null;
+    public static StrictFill of(String fieldName, Class<?> fieldType, Supplier<Object> fieldVal) {
+        return new StrictFill(fieldName, fieldType, fieldVal);
     }
 }