github/JeecgBoot
1
0
Fork 0
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2025-12-31 20:28:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9004 from SunJary/patch-1

Browse Source 
fix#9002 解决字典注解查询出现异常之后，数据源不能恢复问题
This commit is contained in:
JEECG 2025-12-15 17:24:33 +08:00 committed by GitHub
commit b67096dc54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,11 +371,19 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
if (isCustomDataSource) {
DynamicDataSourceContextHolder.push(dataSource);
}
List<DictModel> restData = sysDictMapper.queryTableDictByKeysAndFilterSql(table, text, code, filterSql, codeValues);
// 清理自定义的数据源
if (isCustomDataSource) {
DynamicDataSourceContextHolder.clear();
//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;
}