diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
index c66265f3a..32ddef921 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
@@ -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;
 	}
 
diff --git a/jeecgboot-vue3/src/utils/common/renderUtils.ts b/jeecgboot-vue3/src/utils/common/renderUtils.ts
index 1fdcc7881..dbd522a4f 100644
--- a/jeecgboot-vue3/src/utils/common/renderUtils.ts
+++ b/jeecgboot-vue3/src/utils/common/renderUtils.ts
@@ -45,15 +45,17 @@ const render = {
    */
   renderDict: (v, code, renderTag = false) => {
     let text = '';
+    let color = '';
     let array = getDictItemsByCode(code) || [];
     let obj = array.filter((item) => {
       return item.value == v;
     });
     if (obj.length > 0) {
       text = obj[0].text;
+      color = obj[0].color;
     }
     //【jeecgboot-vue3/issues/903】render.renderDict使用tag渲染报警告问题 #903
-    return isEmpty(text) || !renderTag ? h('span', text) : h(Tag, () => text);
+    return isEmpty(text) || !renderTag ? h('span', text) : h(Tag,{ color }, () => text);
   },
   /**
    * 渲染图片