diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java index dcab05531..6e800fde9 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java @@ -3,9 +3,7 @@ package org.jeecg.common.system.util; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.annotation.EnumDict; import org.jeecg.common.system.vo.DictModel; -import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.oConvertUtils; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; @@ -13,6 +11,7 @@ import org.springframework.core.type.classreading.CachingMetadataReaderFactory; import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.util.ClassUtils; + import java.lang.reflect.Method; import java.util.*; @@ -183,10 +182,10 @@ public class ResourceUtil { for (DictModel dm : dictItemList) { String value = dm.getValue(); if (keySet.contains(value)) { - List list = new ArrayList<>(); + // 修复bug:获取或创建该dictCode对应的list,而不是每次都创建新的list + List list = map.computeIfAbsent(code, k -> new ArrayList<>()); list.add(new DictModel(value, dm.getText())); - map.put(code, list); - break; + //break; } } }