From 9a971e2066077a1f1907e46b5260dcd2956b02a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 13 Sep 2024 19:19:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=88=86=E6=9D=A1?=
 =?UTF-8?q?=E6=AC=BE=E5=AF=BC=E5=85=A5=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FileSplitItemsEOServiceImpl.java     | 56 +++++++------------
 1 file changed, 19 insertions(+), 37 deletions(-)

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<FileSplitItemsEOMap
                                         }
                                         countError++;
                                         valueList = Collections.emptyList();
-                                        break;
+                                        continue;
                                     }else {
                                         valueList.add(first.get().getId());
                                     }
@@ -3203,43 +3203,25 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
 
                                     String[] treePathList = value.split(",");
                                     for (String treePath : treePathList) {
+                                        List<SysDictItem> sysDictItemList = getLevelPath(sysDictItemLists);
                                         List<SysDictItem> 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<SysDictItem> sysDictItemList = getLevelPath(sysDictItemLists);
-                                                List<SysDictItem> 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<SysDictItem> sysDictItemList = getLevelPath(sysDictItemLists);
+                                            valueList.add(path.get(0).getItemValue());
+                                        }else{
                                             List<SysDictItem> 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<FileSplitItemsEOMap
                                                     } else {
                                                         errorMsg += fieldName + " " + treePath + "Exist in multiple;";
                                                     }
-                                                    break;
+                                                    continue;
                                                 }
                                                 valueList.add(pathOther.get(0).getItemValue());
                                             }else{
@@ -3261,7 +3243,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                                 } else {
                                                     errorMsg += fieldName + " " + treePath + "Not exist;";
                                                 }
-                                                break;
+                                                continue;
                                             }
                                         }
                                     }
@@ -3284,7 +3266,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                         } else {
                                             errorMsg += fieldName + " " + treePath + "Exist in multiple;";
                                         }
-                                        break;
+                                        continue;
                                     }
                                     valueList.add(path.get(0).getCode());
                                 }else {
@@ -3295,7 +3277,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                     } else {
                                         errorMsg += fieldName + " " + treePath + "Not exist;";
                                     }
-                                    break;
+                                    continue;
                                 }
                             }
                         }