From 56d60031e8100642a3644d3da5a073e28d6a663e Mon Sep 17 00:00:00 2001 From: yulichang <570810310@qq.com> Date: Sat, 25 May 2024 07:50:40 +0800 Subject: [PATCH] fix: https://github.com/yulichang/mybatis-plus-join/issues/127 --- .../com/github/yulichang/adapter/base/IAdapter.java | 4 ++++ .../com/github/yulichang/adapter/v33x/AdapterV33x.java | 10 ++++++++++ .../github/yulichang/interceptor/MPJInterceptor.java | 2 +- .../com/github/yulichang/kt/KtUpdateJoinWrapper.java | 1 + .../github/yulichang/wrapper/UpdateJoinWrapper.java | 8 ++++---- .../extension/mapping/mapper/MPJTableFieldInfo.java | 1 + .../extension/mapping/mapper/MPJTableInfoHelper.java | 2 +- 7 files changed, 22 insertions(+), 6 deletions(-) diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/IAdapter.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/IAdapter.java index 1cee471..8dfc949 100644 --- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/IAdapter.java +++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/IAdapter.java @@ -25,6 +25,10 @@ public interface IAdapter { return tableFieldInfo.isPrimitive(); } + default String mpjMapping(TableFieldInfo tableFieldInfo) { + return tableFieldInfo.getMapping(); + } + default TableFieldInfo mpjGetLogicField(TableInfo tableInfo) { return tableInfo.getLogicDeleteFieldInfo(); } diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/AdapterV33x.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/AdapterV33x.java index d7ff421..ce87259 100644 --- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/AdapterV33x.java +++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/AdapterV33x.java @@ -3,6 +3,7 @@ package com.github.yulichang.adapter.v33x; import com.baomidou.mybatisplus.core.MybatisPlusVersion; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; +import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.yulichang.adapter.base.IAdapter; import com.github.yulichang.adapter.base.metadata.OrderFieldInfo; @@ -34,6 +35,15 @@ public class AdapterV33x implements IAdapter { return tableFieldInfo.getPropertyType().isPrimitive(); } + @Override + public String mpjMapping(TableFieldInfo tableFieldInfo) { + String el = tableFieldInfo.getEl(); + if (StringUtils.isNotBlank(el) && el.contains(StringPool.COMMA)) { + return el.substring(el.indexOf(StringPool.COMMA) + 1); + } + return null; + } + @Override public TableFieldInfo mpjGetLogicField(TableInfo tableInfo) { return tableInfo.getFieldList().stream().filter(f -> Objects.nonNull(f.getLogicDeleteValue()) diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java index 27b652d..f251cd6 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java @@ -3,13 +3,13 @@ package com.github.yulichang.interceptor; import com.baomidou.mybatisplus.core.MybatisPlusVersion; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.*; -import com.baomidou.mybatisplus.core.toolkit.ReflectionKit; import com.github.yulichang.adapter.AdapterHelper; import com.github.yulichang.adapter.base.tookit.VersionUtils; import com.github.yulichang.config.ConfigProperties; import com.github.yulichang.interfaces.MPJBaseJoin; import com.github.yulichang.query.MPJQueryWrapper; import com.github.yulichang.toolkit.*; +import com.github.yulichang.toolkit.ReflectionKit; import com.github.yulichang.toolkit.support.FieldCache; import com.github.yulichang.wrapper.interfaces.SelectWrapper; import com.github.yulichang.wrapper.resultmap.IResult; diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java index 8b8f297..2fd6a8f 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java @@ -9,6 +9,7 @@ import com.github.yulichang.adapter.AdapterHelper; import com.github.yulichang.kt.interfaces.Update; import com.github.yulichang.toolkit.Constant; import com.github.yulichang.toolkit.KtUtils; +import com.github.yulichang.toolkit.ReflectionKit; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.toolkit.TableList; import com.github.yulichang.wrapper.interfaces.UpdateChain; diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java index 305cf9e..6ae4663 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java @@ -7,10 +7,9 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.*; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.github.yulichang.adapter.AdapterHelper; -import com.github.yulichang.toolkit.Constant; +import com.github.yulichang.toolkit.*; import com.github.yulichang.toolkit.LambdaUtils; -import com.github.yulichang.toolkit.TableHelper; -import com.github.yulichang.toolkit.TableList; +import com.github.yulichang.toolkit.ReflectionKit; import com.github.yulichang.wrapper.interfaces.Update; import com.github.yulichang.wrapper.interfaces.UpdateChain; import lombok.AllArgsConstructor; @@ -266,7 +265,8 @@ public class UpdateJoinWrapper extends JoinAbstractLambdaWrapper