From eb2be90e74adfa06ee251f80c08243d0301ce467 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:49:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
index 45addb3..5d1fef1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
@@ -88,7 +88,7 @@
StringBuilder propertyString = new StringBuilder();
List<SysDictData> datas = getDictCache(dictType);
- if (StrUtil.containsAny(separator, dictValue) && CollUtil.isNotEmpty(datas))
+ if (StrUtil.containsAny(dictValue, separator) && CollUtil.isNotEmpty(datas))
{
for (SysDictData dict : datas)
{
@@ -128,7 +128,7 @@
StringBuilder propertyString = new StringBuilder();
List<SysDictData> datas = getDictCache(dictType);
- if (StrUtil.containsAny(separator, dictLabel) && CollUtil.isNotEmpty(datas))
+ if (StrUtil.containsAny(dictLabel, separator) && CollUtil.isNotEmpty(datas))
{
for (SysDictData dict : datas)
{
@@ -156,6 +156,16 @@
}
/**
+ * 鍒犻櫎鎸囧畾瀛楀吀缂撳瓨
+ *
+ * @param key 瀛楀吀閿�
+ */
+ public static void removeDictCache(String key)
+ {
+ SpringUtils.getBean(RedisCache.class).deleteObject(getCacheKey(key));
+ }
+
+ /**
* 娓呯┖瀛楀吀缂撳瓨
*/
public static void clearDictCache()
--
Gitblit v1.9.3