From 63e007676125a3aa518c2542b24c93b9ae9dde3a Mon Sep 17 00:00:00 2001
From: tanpenggood <tanpengswpu@163.com>
Date: Wed, 2 Sep 2020 11:59:39 +0800
Subject: [PATCH] 修复queryTableDictByKeys与queryTableDictTextByKey存在redis key冲突的情况

---
 jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/CacheConstant.java                    | 1 +
 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/CacheConstant.java b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/CacheConstant.java
index 07c60d3..96ebfe8 100644
--- a/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/CacheConstant.java
+++ b/jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/CacheConstant.java
@@ -15,6 +15,7 @@ public interface CacheConstant {
 	 * 表字典信息缓存
 	 */
     public static final String SYS_DICT_TABLE_CACHE = "sys:cache:dictTable";
+    public static final String SYS_DICT_TABLE_BY_KEYS_CACHE = SYS_DICT_TABLE_CACHE + "ByKeys";
 
 	/**
 	 * 数据权限配置缓存
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
index 0164d90..acfdebc 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
@@ -138,7 +138,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	 * @return
 	 */
 	@Override
-	@Cacheable(value = CacheConstant.SYS_DICT_TABLE_CACHE)
+	@Cacheable(value = CacheConstant.SYS_DICT_TABLE_BY_KEYS_CACHE)
 	public List<String> queryTableDictByKeys(String table, String text, String code, String keys) {
 		if(oConvertUtils.isEmpty(keys)){
 			return null;
--
libgit2 0.22.2