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