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 cdc7fe0e..7606c490 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 @@ -2263,10 +2263,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl sysDictItemList = getLevelPath(sysDictItemLists); List path = - sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath())) + sysDictItemLists.stream().filter(o -> treePath.equals(o.getItemText())) .collect(Collectors.toList()); - 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;"; + 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;"; + } + continue; + } + 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;"; + } + continue; } - continue; } - valueList.add(path.get(0).getItemValue()); - }else{ + }else { + List sysDictItemList = getLevelPath(sysDictItemLists); List pathOther = - sysDictItemLists.stream().filter(o -> treePath.equals(o.getItemText())) + sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath())) .collect(Collectors.toList()); if(!pathOther.isEmpty()){ if (path.size() > 1) {