移除过时的FieldStrategy.IGNORED

baomidou · Jan 23, 2025 · 1f75f27 · 1f75f27
1 parent e7e446e
commit 1f75f27
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/FieldStrategy.java b/mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/FieldStrategy.java
@@ -24,13 +24,6 @@
  * @since 2016-09-09
  */
 public enum FieldStrategy {
-    /**
-     * 忽略判断
-     *
-     * @deprecated 3.5.3.2 该字段存在语义理解问题效果等于{@link #ALWAYS}
-     */
-    @Deprecated
-    IGNORED,
     /**
      * 任何时候都加入 SQL
      */

diff --git a/mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/Wrapper.java b/mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/Wrapper.java
@@ -20,7 +20,10 @@
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
-import com.baomidou.mybatisplus.core.toolkit.*;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 
 import java.util.Objects;
 
@@ -158,8 +161,6 @@ private boolean fieldStrategyMatch(TableInfo tableInfo, T entity, TableFieldInfo
         switch (e.getWhereStrategy()) {
             case NOT_NULL:
                 return Objects.nonNull(tableInfo.getPropertyValue(entity, e.getProperty()));
-            case IGNORED:
-                return true;
             case ALWAYS:
                 return true;
             case NOT_EMPTY:

diff --git a/mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableFieldInfo.java b/mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableFieldInfo.java
@@ -587,7 +587,7 @@ private String convertIf(final String sqlScript, final String property, final Fi
         if (fieldStrategy == FieldStrategy.NEVER) {
             return null;
         }
-        if (isPrimitive || fieldStrategy == FieldStrategy.IGNORED || fieldStrategy == FieldStrategy.ALWAYS) {
+        if (isPrimitive || fieldStrategy == FieldStrategy.ALWAYS) {
             return sqlScript;
         }
         if (fieldStrategy == FieldStrategy.NOT_EMPTY && isCharSequence) {