From 56322786887f99604450cde07c9cab6fb5ea5135 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 12 七月 2021 11:39:43 +0800 Subject: [PATCH] !67 同步dev分支 Merge pull request !67 from 疯狂的狮子Li/dev --- ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java | 4 ++-- 1 files changed, 2 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 7da0c66..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) { -- Gitblit v1.9.3