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 'master' into 1.3

Browse Source 
# Conflicts:
#	mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
#	pom.xml
This commit is contained in:
yulichang 2022-11-12 02:38:31 +08:00
commit 744a0c81db
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
View File

@ -150,13 +150,13 @@ public class MPJInterceptor implements Interceptor {
TableInfo tableInfo = TableInfoHelper.getTableInfo(resultType); TableInfo tableInfo = TableInfoHelper.getTableInfo(resultType);
String id = ms.getId() + StringPool.DOT + Constants.MYBATIS_PLUS + StringPool.UNDERSCORE + resultType.getName(); String id = ms.getId() + StringPool.DOT + Constants.MYBATIS_PLUS + StringPool.UNDERSCORE + resultType.getName();
if (!(obj instanceof MPJLambdaWrapper) || Map.class.isAssignableFrom(resultType) || if (!(obj instanceof MPJLambdaWrapper) || Map.class.isAssignableFrom(resultType) ||
com.github.yulichang.toolkit.ReflectionKit.isPrimitiveOrWrapper(resultType) || ReflectionKit.isPrimitiveOrWrapper(resultType) ||
Collection.class.isAssignableFrom(resultType)) { Collection.class.isAssignableFrom(resultType)) {
result.add(getDefaultResultMap(tableInfo, ms, resultType, id)); result.add(getDefaultResultMap(tableInfo, ms, resultType, id));
return result; return result;
} }
MPJLambdaWrapper wrapper = (MPJLambdaWrapper) obj; MPJLambdaWrapper wrapper = (MPJLambdaWrapper) obj;
Map<String, Field> fieldMap = com.github.yulichang.toolkit.ReflectionKit.getFieldMap(resultType); Map<String, Field> fieldMap = ReflectionKit.getFieldMap(resultType);
List<SelectColumn> columnList = wrapper.getSelectColumns(); List<SelectColumn> columnList = wrapper.getSelectColumns();
//移除对多查询列，为了可重复使用wrapper //移除对多查询列，为了可重复使用wrapper
columnList.removeIf(SelectColumn::isLabel); columnList.removeIf(SelectColumn::isLabel);
@ -168,8 +168,11 @@ public class MPJInterceptor implements Interceptor {
ResultMapping.Builder builder = new ResultMapping.Builder(ms.getConfiguration(), i.getAlias(), ResultMapping.Builder builder = new ResultMapping.Builder(ms.getConfiguration(), i.getAlias(),
i.getAlias(), getAliasField(resultType, fieldMap, i.getAlias())); i.getAlias(), getAliasField(resultType, fieldMap, i.getAlias()));
if (i.getFuncEnum() == null || StringUtils.isBlank(i.getFuncEnum().getSql())) { if (i.getFuncEnum() == null || StringUtils.isBlank(i.getFuncEnum().getSql())) {
Field f = fieldMap.get(i.getAlias());
if (f == null) {
continue;
}
if (info != null && info.getTypeHandler() != null && info.getTypeHandler() != UnknownTypeHandler.class) { if (info != null && info.getTypeHandler() != null && info.getTypeHandler() != UnknownTypeHandler.class) {
Field f = fieldMap.get(i.getAlias());
if (f.getType() == info.getField().getType()) { if (f.getType() == info.getField().getType()) {
builder.typeHandler(getTypeHandler(ms, info)); builder.typeHandler(getTypeHandler(ms, info));
} }
@ -181,15 +184,16 @@ public class MPJInterceptor implements Interceptor {
if (i.getFuncEnum() == null || StringUtils.isBlank(i.getFuncEnum().getSql())) { if (i.getFuncEnum() == null || StringUtils.isBlank(i.getFuncEnum().getSql())) {
ResultMapping.Builder builder = new ResultMapping.Builder(ms.getConfiguration(), info.getProperty(), ResultMapping.Builder builder = new ResultMapping.Builder(ms.getConfiguration(), info.getProperty(),
StringUtils.getTargetColumn(info.getColumn()), info.getPropertyType()); StringUtils.getTargetColumn(info.getColumn()), info.getPropertyType());
if (info.getTypeHandler() != null && info.getTypeHandler() != UnknownTypeHandler.class) { Field f = fieldMap.get(info.getProperty());
Field f = fieldMap.get(info.getProperty()); if (f == null) {
if (f == null) { continue;
continue; }
} if (f.getType() == info.getField().getType()) {
if (f.getType() == info.getField().getType()) { if (info.getTypeHandler() != null && info.getTypeHandler() != UnknownTypeHandler.class) {
builder.typeHandler(getTypeHandler(ms, info)); builder.typeHandler(getTypeHandler(ms, info));
} }
} }
builder.javaType(f.getType());
resultMappings.add(builder.build()); resultMappings.add(builder.build());
} else { } else {
resultMappings.add(new ResultMapping.Builder(ms.getConfiguration(), info.getProperty(), resultMappings.add(new ResultMapping.Builder(ms.getConfiguration(), info.getProperty(),