diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java index 1d36f08..823e71d 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java @@ -122,12 +122,13 @@ public interface MPJBaseMethod extends Constants { tableFieldInfo.getWhereStrategy()); } - @SuppressWarnings({"DuplicatedCode", "deprecation"}) + @SuppressWarnings("DuplicatedCode") default String convertIf(TableFieldInfo tableFieldInfo, final String sqlScript, final String property, final FieldStrategy fieldStrategy) { if (fieldStrategy == FieldStrategy.NEVER) { return null; } - if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo) || fieldStrategy == FieldStrategy.IGNORED) { + if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo) || fieldStrategy == FieldStrategy.ALWAYS + || fieldStrategy.name().equalsIgnoreCase("IGNORED")) { return sqlScript; } if (fieldStrategy == FieldStrategy.NOT_EMPTY && tableFieldInfo.isCharSequence()) { diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoin.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoin.java index 6b7a11a..3787608 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoin.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoin.java @@ -59,12 +59,14 @@ public class UpdateJoin extends MPJAbstractMethod { * @param fieldStrategy 验证策略 * @return if 脚本片段 */ + @SuppressWarnings("DuplicatedCode") @Override public String mpjConvertIf(TableFieldInfo tableFieldInfo, final String sqlScript, final String property, final FieldStrategy fieldStrategy) { if (fieldStrategy == FieldStrategy.NEVER) { return null; } - if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo) || fieldStrategy == FieldStrategy.IGNORED) { + if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo) || fieldStrategy == FieldStrategy.ALWAYS || + fieldStrategy.name().equalsIgnoreCase("IGNORED")) { return sqlScript; } if (fieldStrategy == FieldStrategy.NOT_EMPTY && tableFieldInfo.isCharSequence()) { diff --git a/pom.xml b/pom.xml index ddd4449..ff8954d 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 1.5.3 - 3.5.10.1 + 3.5.11 17 17