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

fix: close https://github.com/mybatis-flex/mybatis-flex/issues/471

Browse Source
This commit is contained in:
Michael Yang 2025-01-10 09:17:36 +08:00
parent c88155de85
commit 39b0efbd6a
1 changed files with 68 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mybatis-flex-core/src/main/java/com/mybatisflex/core/relation/RelationManager.java
View File

@ -309,8 +309,6 @@ public class RelationManager {
return; return;
} }
String currentDsKey = DataSourceKey.get();
try {
relations.forEach(relation -> { relations.forEach(relation -> {
//ignore //ignore
@ -327,16 +325,12 @@ public class RelationManager {
} }
//注解配置的数据源 //注解配置的数据源
String configDsKey = relation.getDataSource(); String relationDsKey = relation.getDataSource();
if (StringUtil.noText(configDsKey) && currentDsKey != null) { if (StringUtil.hasText(relationDsKey)) {
configDsKey = currentDsKey; DataSourceKey.use(relationDsKey);
} }
try { try {
if (StringUtil.hasText(configDsKey)) {
DataSourceKey.use(configDsKey);
}
Set<Object> targetValues; Set<Object> targetValues;
List<Row> mappingRows = null; List<Row> mappingRows = null;
@ -391,16 +385,11 @@ public class RelationManager {
relation.join(entities, targetObjectList, mappingRows); relation.join(entities, targetObjectList, mappingRows);
} }
} finally { } finally {
if (StringUtil.hasText(configDsKey)) { if (StringUtil.hasText(relationDsKey)) {
DataSourceKey.clear(); DataSourceKey.clear();
} }
} }
}); });
} finally {
if (currentDsKey != null) {
DataSourceKey.use(currentDsKey);
}
}
} }
} }