From 509ac3f8ec112b2b94ad874f3304a0ce9d448796 Mon Sep 17 00:00:00 2001 From: York0519 <34875700+York0519@users.noreply.github.com> Date: Thu, 5 Jun 2025 18:58:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(ResourceUtil.java):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E8=BD=AC=E4=B8=AD=E6=96=87=E6=97=B6=EF=BC=8C?= =?UTF-8?q?keys=E4=BC=A0=E5=A4=9A=E4=B8=AA=E4=B9=9F=E5=8F=AAadd=E7=AC=AC1?= =?UTF-8?q?=E4=B8=AA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/system/util/ResourceUtil.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 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 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; }