third_codes/mybatis-plus-join
1
0
Fork 0
mirror of https://gitee.com/best_handsome/mybatis-plus-join synced 2025-07-11 00:02:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v'

Browse Source
This commit is contained in:
yulichang 2025-03-26 01:11:51 +08:00
commit cbedb2f58c
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java
View File

@ -122,12 +122,13 @@ public interface MPJBaseMethod extends Constants {
tableFieldInfo.getWhereStrategy()); tableFieldInfo.getWhereStrategy());
} }
@SuppressWarnings({"DuplicatedCode", "deprecation"}) @SuppressWarnings("DuplicatedCode")
default String convertIf(TableFieldInfo tableFieldInfo, final String sqlScript, final String property, final FieldStrategy fieldStrategy) { default String convertIf(TableFieldInfo tableFieldInfo, final String sqlScript, final String property, final FieldStrategy fieldStrategy) {
if (fieldStrategy == FieldStrategy.NEVER) { if (fieldStrategy == FieldStrategy.NEVER) {
return null; return null;
} }
if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo) || fieldStrategy == FieldStrategy.IGNORED) { if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo) || fieldStrategy == FieldStrategy.ALWAYS
|| fieldStrategy.name().equalsIgnoreCase("IGNORED")) {
return sqlScript; return sqlScript;
} }
if (fieldStrategy == FieldStrategy.NOT_EMPTY && tableFieldInfo.isCharSequence()) { if (fieldStrategy == FieldStrategy.NOT_EMPTY && tableFieldInfo.isCharSequence()) {

4
mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoin.java
View File

@ -59,12 +59,14 @@ public class UpdateJoin extends MPJAbstractMethod {
* @param fieldStrategy 验证策略 * @param fieldStrategy 验证策略
* @return if 脚本片段 * @return if 脚本片段
*/ */
@SuppressWarnings("DuplicatedCode")
@Override @Override
public String mpjConvertIf(TableFieldInfo tableFieldInfo, final String sqlScript, final String property, final FieldStrategy fieldStrategy) { public String mpjConvertIf(TableFieldInfo tableFieldInfo, final String sqlScript, final String property, final FieldStrategy fieldStrategy) {
if (fieldStrategy == FieldStrategy.NEVER) { if (fieldStrategy == FieldStrategy.NEVER) {
return null; return null;
} }
if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo) || fieldStrategy == FieldStrategy.IGNORED) { if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo) || fieldStrategy == FieldStrategy.ALWAYS ||
fieldStrategy.name().equalsIgnoreCase("IGNORED")) {
return sqlScript; return sqlScript;
} }
if (fieldStrategy == FieldStrategy.NOT_EMPTY && tableFieldInfo.isCharSequence()) { if (fieldStrategy == FieldStrategy.NOT_EMPTY && tableFieldInfo.isCharSequence()) {

2
pom.xml
View File

@ -45,7 +45,7 @@
<properties> <properties>
<revision>1.5.3</revision> <revision>1.5.3</revision>
<mybatis.plus.version>3.5.10.1</mybatis.plus.version> <mybatis.plus.version>3.5.11</mybatis.plus.version>
<jdkVersion>17</jdkVersion> <jdkVersion>17</jdkVersion>
<jdkVersion.test>17</jdkVersion.test> <jdkVersion.test>17</jdkVersion.test>