admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-08 01:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: https://gitee.com/mybatis-flex/mybatis-flex/issues/IALZP9

Browse Source
This commit is contained in:
Michael Yang 2024-08-23 17:20:58 +08:00
parent b98acf0b47
commit 1028bbd58c
4 changed files with 8 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/BaseMapper.java
View File

@ -592,12 +592,14 @@ public interface BaseMapper<T> {
* @return 实体类数据
*/
default <R> R selectOneWithRelationsByIdAs(Serializable id, Class<R> asType) {
R result;
try {
MappedStatementTypes.setCurrentType(asType);
return (R) selectOneWithRelationsById(id);
result = (R) selectOneById(id);
} finally {
MappedStatementTypes.clear();
}
return MapperUtil.queryRelations(this, result);
}
/**

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexConfiguration.java
View File

@ -144,7 +144,7 @@ public class FlexConfiguration extends Configuration {
//动态 resultsMap，方法名称为：selectListByQuery
Class<?> asType = MappedStatementTypes.getCurrentType();
//忽略掉查询 Rows 的方法
if (asType != null && !id.endsWith("selectRowsByQuery")) {
if (asType != null) {
return MapUtil.computeIfAbsent(dynamicMappedStatementCache, id + ":" + asType.getName(),
clazz -> replaceResultMap(ms, TableInfoFactory.ofEntityClass(asType))
);

15
mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/MappedStatementTypes.java
View File

@ -15,32 +15,23 @@
*/
package com.mybatisflex.core.mybatis;
import java.util.Stack;
public class MappedStatementTypes {
private MappedStatementTypes() {
}
private static final ThreadLocal<Stack<Class<?>>> currentTypeTL = ThreadLocal.withInitial(Stack::new);
private static final ThreadLocal<Class<?>> currentTypeTL = new ThreadLocal<>();
public static void setCurrentType(Class<?> type) {
currentTypeTL.get().push(type);
currentTypeTL.set(type);
}
public static Class<?> getCurrentType() {
Stack<Class<?>> stack = currentTypeTL.get();
return stack.isEmpty() ? null : stack.lastElement();
return currentTypeTL.get();
}
public static void clear() {
Stack<Class<?>> stack = currentTypeTL.get();
if (!stack.isEmpty()) {
stack.pop();
}
if (stack.isEmpty()) {
currentTypeTL.remove();
}
}
}

32
mybatis-flex-core/src/test/java/com/mybatisflex/core/util/MappedStatementTypesTest.java
View File

@ -1,32 +0,0 @@
package com.mybatisflex.core.util;
import com.mybatisflex.core.mybatis.MappedStatementTypes;
import org.junit.Assert;
import org.junit.Test;
public class MappedStatementTypesTest {
@Test
public void test() {
MappedStatementTypes.clear();
MappedStatementTypes.setCurrentType(String.class);
MappedStatementTypes.setCurrentType(MappedStatementTypesTest.class);
MappedStatementTypes.setCurrentType(StringUtilTest.class);
Assert.assertEquals(StringUtilTest.class, MappedStatementTypes.getCurrentType());
System.out.println(MappedStatementTypes.getCurrentType());
MappedStatementTypes.clear();
Assert.assertEquals(MappedStatementTypesTest.class, MappedStatementTypes.getCurrentType());
System.out.println(MappedStatementTypes.getCurrentType());
MappedStatementTypes.clear();
Assert.assertEquals(String.class, MappedStatementTypes.getCurrentType());
System.out.println(MappedStatementTypes.getCurrentType());
MappedStatementTypes.clear();
Assert.assertNull(MappedStatementTypes.getCurrentType());
System.out.println(MappedStatementTypes.getCurrentType());
}
}