pengjunjie/JeecgBoot
1
0
Fork 1
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2025-12-23 22:36:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix#9002 解决字典注解查询出现异常之后，数据源不能恢复问题

Browse Source
This commit is contained in:
Jary
2025-10-20 22:21:47 +08:00
committed by GitHub
parent b97d041e7f
commit adc191f03e
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
View File

@ -376,11 +376,19 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
if (isCustomDataSource) {
DynamicDataSourceContextHolder.push(dataSource);
}
List<DictModel> restData = sysDictMapper.queryTableDictByKeysAndFilterSql(table, text, code, filterSql, codeValues);
//update-begin---author:jarysun ---date:20251020 for：[issues/#9002]解决表字典查询出现异常之后，数据源不能恢复问题------------
List<DictModel> restData = null;
try {
restData = sysDictMapper.queryTableDictByKeysAndFilterSql(table, text, code, filterSql, codeValues);
} finally {
// 清理自定义的数据源
if (isCustomDataSource) {
DynamicDataSourceContextHolder.clear();
}
}
//update-end---author:jarysun ---date:20251020 for：[issues/#9002]解决表字典查询出现异常之后，数据源不能恢复问题------------
return restData;
//update-end---author:chenrui ---date:20231221 for：[issues/#5643]解决分布式下表字典跨库无法查询问题------------
//update-end-author:taoyan date:20220113 for: @dict注解支持 dicttable 设置where条件