diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 66d02c5c..cdc7fe0e 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -3177,7 +3177,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl sysDictItemList = getLevelPath(sysDictItemLists); List path = - sysDictItemLists.stream().filter(o -> treePath.equals(o.getItemText())) + sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath())) .collect(Collectors.toList()); - if (!path.isEmpty()){ - // 如果有多个,按照全路径去匹配一遍 - if(path.size() > 1){ - List sysDictItemList = getLevelPath(sysDictItemLists); - List pathOther = - sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath())) - .collect(Collectors.toList()); - if(!pathOther.isEmpty()){ - if (path.size() > 1) { - if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { - errorMsg += fieldName + "中" + treePath + "存在多个;"; - countError++; - valueList = Collections.emptyList(); - } else { - errorMsg += fieldName + " " + treePath + "Exist in multiple;"; - } - break; - } - valueList.add(pathOther.get(0).getItemValue()); - }else{ - if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { - errorMsg += fieldName + "中" + treePath + "存在多个;"; - countError++; - valueList = Collections.emptyList(); - } else { - errorMsg += fieldName + " " + treePath + "Not exist;"; - } - break; + if(!path.isEmpty()){ + if (path.size() > 1) { + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { + errorMsg += fieldName + "中" + treePath + "存在多个;"; + countError++; + valueList = Collections.emptyList(); + } else { + errorMsg += fieldName + " " + treePath + "Exist in multiple;"; } + continue; } - }else { - List sysDictItemList = getLevelPath(sysDictItemLists); + valueList.add(path.get(0).getItemValue()); + }else{ List pathOther = - sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath())) + sysDictItemLists.stream().filter(o -> treePath.equals(o.getItemText())) .collect(Collectors.toList()); if(!pathOther.isEmpty()){ if (path.size() > 1) { @@ -3250,7 +3232,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl