diff --git a/README-zh.md b/README-zh.md index 0b4ed54..8a3f2d2 100644 --- a/README-zh.md +++ b/README-zh.md @@ -12,9 +12,6 @@ Maven central - - Sonatype Nexus (Snapshots) - code style @@ -49,12 +46,12 @@ com.github.yulichang mybatis-plus-join-boot-starter - 1.5.3 + 1.5.4 ``` - Gradle ``` - implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.5.3' + implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.5.4' ``` 或者clone代码到本地执行 `mvn install`, 再引入以上依赖
diff --git a/README.md b/README.md index 1d28832..a938205 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,6 @@ Maven central - - Sonatype Nexus (Snapshots) - code style @@ -49,12 +46,12 @@ com.github.yulichang mybatis-plus-join-boot-starter - 1.5.3 + 1.5.4 ``` - Gradle ``` - implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.5.3' + implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.5.4' ``` 或者clone代码到本地执行 `mvn install`, 再引入以上依赖
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 3b6757d..99ab99f 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 @@ -17,6 +17,7 @@ import java.net.URLEncoder; import java.util.Comparator; import java.util.List; import java.util.Objects; +import java.util.Optional; import static java.util.stream.Collectors.joining; @@ -127,9 +128,10 @@ public interface MPJBaseMethod extends Constants { if (fieldStrategy == FieldStrategy.NEVER) { return null; } + FieldStrategy strategy = Optional.ofNullable(fieldStrategy).orElse(FieldStrategy.DEFAULT); if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo) - || fieldStrategy.name().equalsIgnoreCase("ALWAYS") - || fieldStrategy.name().equalsIgnoreCase("IGNORED")) { + || strategy.name().equalsIgnoreCase("ALWAYS") + || strategy.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 40571a1..bb434b8 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 @@ -8,6 +8,8 @@ import com.github.yulichang.adapter.AdapterHelper; import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlSource; +import java.util.Optional; + /** * copy {@link com.baomidou.mybatisplus.core.injector.methods.Update} * @@ -65,9 +67,10 @@ public class UpdateJoin extends MPJAbstractMethod { if (fieldStrategy == FieldStrategy.NEVER) { return null; } + FieldStrategy strategy = Optional.ofNullable(fieldStrategy).orElse(FieldStrategy.DEFAULT); if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo) - || fieldStrategy.name().equalsIgnoreCase("ALWAYS") - || fieldStrategy.name().equalsIgnoreCase("IGNORED")) { + || strategy.name().equalsIgnoreCase("ALWAYS") + || strategy.name().equalsIgnoreCase("IGNORED")) { return sqlScript; } if (fieldStrategy == FieldStrategy.NOT_EMPTY && tableFieldInfo.isCharSequence()) {