From b8bbe72e7cbbb6406bf27d76bf3ba9c4c0c5ac16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Tue, 24 Sep 2024 14:25:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E6=AC=BE=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FileSplitItemsEOServiceImpl.java     | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 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 6546c929..bc9012f7 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
@@ -3184,7 +3184,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                         }
                                         countError++;
                                         valueList = Collections.emptyList();
-                                        continue;
+                                        break;
                                     }else {
                                         valueList.add(first.get().getId());
                                     }
@@ -3221,7 +3221,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                                         sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath()))
                                                                 .collect(Collectors.toList());
                                                 if(!pathOther.isEmpty()){
-                                                    if (path.size() > 1) {
+                                                    if (pathOther.size() > 1) {
                                                         if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                                             errorMsg += fieldName + "中" + treePath + "存在多个；";
                                                             countError++;
@@ -3229,9 +3229,13 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                                         } else {
                                                             errorMsg += fieldName + " " + treePath + "Exist in multiple;";
                                                         }
-                                                        continue;
+                                                        break;
                                                     }
-                                                    valueList.add(pathOther.get(0).getItemValue());
+                                                    if(CollectionUtils.isEmpty(valueList)){
+                                                        valueList = new ArrayList<>();
+                                                        valueList.add(path.get(0).getItemValue());
+                                                    }
+
                                                 }else{
                                                     if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                                         errorMsg += fieldName + "中" + treePath + "存在多个；";
@@ -3240,7 +3244,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                                     } else {
                                                         errorMsg += fieldName + " " + treePath + "Not exist;";
                                                     }
-                                                    continue;
+                                                    break;
+                                                }
+                                            }else{
+                                                if(CollectionUtils.isEmpty(valueList)){
+                                                    valueList = new ArrayList<>();
+                                                    valueList.add(path.get(0).getItemValue());
                                                 }
                                             }
                                         }else {
@@ -3249,7 +3258,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                                     sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath()))
                                                             .collect(Collectors.toList());
                                             if(!pathOther.isEmpty()){
-                                                if (path.size() > 1) {
+                                                if (pathOther.size() > 1) {
                                                     if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                                         errorMsg += fieldName + "中" + treePath + "存在多个；";
                                                         countError++;
@@ -3257,9 +3266,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                                     } else {
                                                         errorMsg += fieldName + " " + treePath + "Exist in multiple;";
                                                     }
-                                                    continue;
+                                                    break;
+                                                }
+                                                if(CollectionUtils.isEmpty(valueList)){
+                                                    valueList = new ArrayList<>();
+                                                    valueList.add(pathOther.get(0).getItemValue());
                                                 }
-                                                valueList.add(pathOther.get(0).getItemValue());
                                             }else{
                                                 if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                                     errorMsg += fieldName + "中" + treePath + "不存在；";
@@ -3268,7 +3280,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                                 } else {
                                                     errorMsg += fieldName + " " + treePath + "Not exist;";
                                                 }
-                                                continue;
+                                                break;
                                             }
                                         }
                                     }
@@ -3291,7 +3303,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                         } else {
                                             errorMsg += fieldName + " " + treePath + "Exist in multiple;";
                                         }
-                                        continue;
+                                        break;
                                     }
                                     valueList.add(path.get(0).getCode());
                                 }else {
@@ -3302,7 +3314,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                     } else {
                                         errorMsg += fieldName + " " + treePath + "Not exist;";
                                     }
-                                    continue;
+                                    break;
                                 }
                             }
                         }