fix https://github.com/yulichang/mybatis-plus-join/issues/283

Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 3.5.0 to 3.5.3.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.0...v3.5.3)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-dependencies
  dependency-version: 3.5.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/maven.yml

@@ -21,10 +21,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven

README-zh.md

@@ -12,9 +12,6 @@
   <a href="https://central.sonatype.com/artifact/com.github.yulichang/mybatis-plus-join-boot-starter">
     <img alt="Maven central" src="https://img.shields.io/maven-central/v/com.github.yulichang/mybatis-plus-join-boot-starter.svg?style=flat-square">
   </a>
-  <a href="https://oss.sonatype.org/content/repositories/snapshots/com/github/yulichang/mybatis-plus-join-boot-starter/">
-    <img alt="Sonatype Nexus (Snapshots)" src="https://img.shields.io/nexus/s/https/oss.sonatype.org/com.github.yulichang/mybatis-plus-join-boot-starter.svg">
-  </a>
   <a href="https://www.apache.org/licenses/LICENSE-2.0">
     <img alt="code style" src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square">
   </a>
@@ -33,7 +30,6 @@
 </p>
 
 <p align="center">
-QQ群:680016987  或者 
 <a href="https://gitee.com/best_handsome/mybatis-plus-join/issues/I65N2M" target="_blank">添加作者微信，备注MPJ，加入微信群</a>  
 <br/>
 <img width="200px" height="200px" src="https://foruda.gitee.com/images/1714756135330585984/bcc86eb0_2020985.png"  alt="添加作者微信，备注MPJ，加入微信群"/>
@@ -50,12 +46,12 @@ QQ群:680016987  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.5.3</version>
+      <version>1.5.4</version>
   </dependency>
   ```
 - 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`, 再引入以上依赖  
   <br>

README.md

@@ -12,9 +12,6 @@
   <a href="https://central.sonatype.com/artifact/com.github.yulichang/mybatis-plus-join-boot-starter">
     <img alt="Maven central" src="https://img.shields.io/maven-central/v/com.github.yulichang/mybatis-plus-join-boot-starter.svg?style=flat-square">
   </a>
-  <a href="https://oss.sonatype.org/content/repositories/snapshots/com/github/yulichang/mybatis-plus-join-boot-starter/">
-    <img alt="Sonatype Nexus (Snapshots)" src="https://img.shields.io/nexus/s/https/oss.sonatype.org/com.github.yulichang/mybatis-plus-join-boot-starter.svg">
-  </a>
   <a href="https://www.apache.org/licenses/LICENSE-2.0">
     <img alt="code style" src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square">
   </a>
@@ -33,7 +30,6 @@
 </p>
 
 <p align="center">
-QQ群:680016987  或者 
 <a href="https://gitee.com/best_handsome/mybatis-plus-join/issues/I65N2M" target="_blank">添加作者微信，备注MPJ，加入微信群</a>
 <br/>
 <img width="200px" height="200px" src="https://github.com/yulichang/mybatis-plus-join/assets/33247410/6a2aedfa-c67d-4691-9441-204f28b6c73d"  alt="添加作者微信，备注MPJ，加入微信群"/>
@@ -50,12 +46,12 @@ QQ群:680016987  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.5.3</version>
+      <version>1.5.4</version>
   </dependency>
   ```
 - 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`, 再引入以上依赖  
   <br>

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,8 +128,10 @@ public interface MPJBaseMethod extends Constants {
         if (fieldStrategy == FieldStrategy.NEVER) {
             return null;
         }
-        if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo) || fieldStrategy == FieldStrategy.ALWAYS
-                || fieldStrategy.name().equalsIgnoreCase("IGNORED")) {
+        FieldStrategy strategy = Optional.ofNullable(fieldStrategy).orElse(FieldStrategy.DEFAULT);
+        if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo)
+                || strategy.name().equalsIgnoreCase("ALWAYS")
+                || strategy.name().equalsIgnoreCase("IGNORED")) {
             return sqlScript;
         }
         if (fieldStrategy == FieldStrategy.NOT_EMPTY && tableFieldInfo.isCharSequence()) {

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,8 +67,10 @@ public class UpdateJoin extends MPJAbstractMethod {
         if (fieldStrategy == FieldStrategy.NEVER) {
             return null;
         }
-        if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo) || fieldStrategy == FieldStrategy.ALWAYS ||
-                fieldStrategy.name().equalsIgnoreCase("IGNORED")) {
+        FieldStrategy strategy = Optional.ofNullable(fieldStrategy).orElse(FieldStrategy.DEFAULT);
+        if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo)
+                || strategy.name().equalsIgnoreCase("ALWAYS")
+                || strategy.name().equalsIgnoreCase("IGNORED")) {
             return sqlScript;
         }
         if (fieldStrategy == FieldStrategy.NOT_EMPTY && tableFieldInfo.isCharSequence()) {

plugin/mybatis-plus-join-processor/pom.xml

@@ -18,7 +18,7 @@
         <dependency>
             <groupId>ognl</groupId>
             <artifactId>ognl</artifactId>
-            <version>3.4.6</version>
+            <version>3.4.7</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

plugin/mybatis-plus-join-solon-plugin/pom.xml

@@ -18,7 +18,7 @@
             <dependency>
                 <groupId>org.noear</groupId>
                 <artifactId>solon</artifactId>
-                <version>3.1.0</version>
+                <version>3.3.3</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-solon-plugin</artifactId>
-            <version>3.5.10.1</version>
+            <version>3.5.12</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

pom.xml

@@ -44,8 +44,8 @@
     </modules>
 
     <properties>
-        <revision>1.5.3</revision>
-        <mybatis.plus.version>3.5.11</mybatis.plus.version>
+        <revision>1.5.4</revision>
+        <mybatis.plus.version>3.5.12</mybatis.plus.version>
 
         <jdkVersion>17</jdkVersion>
         <jdkVersion.test>17</jdkVersion.test>
@@ -62,7 +62,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.4.4</version>
+                <version>3.5.3</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>