From 17a81e89a53373567d7f224a112060d823c824de Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Mon, 15 Dec 2025 15:04:17 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E7=94=A8=E4=BA=8E=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=BF=BB=E8=AF=91=E2=80=9D=EF=BC=8C=E5=90=8C?= =?UTF-8?q?=E4=B8=80=E6=9E=9A=E4=B8=BEdictCode=EF=BC=8Ckeys=E4=BC=A0?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E4=B9=9F=E5=8F=AAadd=E7=AC=AC1=E4=B8=AADictM?= =?UTF-8?q?odel=20=20#9124?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/common/system/util/ResourceUtil.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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; } } }