ZF/JeecgBoot
1
0
Fork 0
mirror of https://gitee.com/jeecg/JeecgBoot.git synced 2025-12-30 09:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

“用于后端字典翻译”，同一枚举dictCode，keys传多个也只add第1个DictModel #9124

Browse Source
This commit is contained in:
JEECG
2025-12-15 15:04:17 +08:00
parent bcbf775756
commit 17a81e89a5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java
View File

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