github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 509ac3f8ec into 118775cf79

pull/8387/merge
York0519 2025-07-26 18:46:32 +02:00 committed by GitHub
parent 118775cf79 509ac3f8ec
commit b874a2430e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,18 +100,19 @@ public class ResourceUtil {
} }
Map<String, List<DictModel>> map = new HashMap<>(); Map<String, List<DictModel>> map = new HashMap<>();
for (String code : enumDictData.keySet()) { for (String code : enumDictData.keySet()) {
if(dictCodeList.indexOf(code)>=0){ if(dictCodeList.indexOf(code)<0){
List<DictModel> dictItemList = enumDictData.get(code); continue;
for(DictModel dm: dictItemList){
String value = dm.getValue();
if(keys.indexOf(value)>=0){
List<DictModel> list = new ArrayList<>();
list.add(new DictModel(value, dm.getText()));
map.put(code,list);
break;
}
}
} }
List<DictModel> dictItemList = enumDictData.get(code);
List<DictModel> list = new ArrayList<>();
for(DictModel dm: dictItemList){
String value = dm.getValue();
if(keys.indexOf(value)<0){
continue;
}
list.add(new DictModel(value, dm.getText()));
}
map.put(code,list);
} }
return map; return map;
} }