From 4c45ea010803bf0721594c6db75c8d5c7e92088a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 27 Sep 2024 16:34:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E6=9D=A1=E6=AC=BE=E4=BF=A1=E6=81=AF-=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=8B=86=E5=88=86=E7=BB=93=E6=9E=9C=20=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=89=80=E6=9C=89=E7=9B=AE=E5=BD=95=E9=83=BD=E5=9C=A8?=
 =?UTF-8?q?=E6=80=BB=E7=9B=AE=E5=BD=95=E4=B8=8B=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/split/service/impl/FileSplitItemsEOServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 cdf99a00..6dc400c2 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
@@ -3646,7 +3646,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
 
         List<SarFileSplitMenuTreeNode> treeNodeList = new ArrayList<>();
         String regex = "^[0-9]{0}([0-9]|[.])+$"; //TODO 待优化：数字和点必须交替
-        String parentId = "";
+        String parentId = menuId;
         for (Map<String, Object> itemEO : addItemsEOList) {
             String itemNum = itemEO.get("item_num").toString().trim();
             String itemTitle = itemEO.get("item_title").toString();

From 5fa0acdc1e1c1602603190627f1bee829e9eeaa4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 27 Sep 2024 17:00:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E6=8B=86=E5=88=86=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FileSplitItemsEOServiceImpl.java     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 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 6dc400c2..838544e0 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
@@ -3191,7 +3191,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                                     errorMsg += fieldName + " " + v + "Not exist;";
                                                 }
                                                 countError++;
-                                                valueList = Collections.emptyList();
+                                                valueList = new ArrayList<>();
                                                 break;
                                             }
                                         }
@@ -3202,7 +3202,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                             errorMsg += fieldName + " " + v + "Not exist;";
                                         }
                                         countError++;
-                                        valueList = Collections.emptyList();
+                                        valueList = new ArrayList<>();
                                         break;
                                     }
                                     String cellValue = this.convertMultiOrgId(v, departMap, departPartMap);
@@ -3213,7 +3213,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                             errorMsg += fieldName + " " + v + "Not exist;";
                                         }
                                         countError++;
-                                        valueList = Collections.emptyList();
+                                        valueList = new ArrayList<>();
                                         break;
                                     }
                                     valueList.add(cellValue);
@@ -3226,7 +3226,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
 //                                            errorMsg += fieldName + " " + v + "Not exist;";
 //                                        }
 //                                        countError++;
-//                                        valueList = Collections.emptyList();
+//                                        valueList = new ArrayList<>();
 //                                        break;
 //                                    }else {
 //                                        valueList.add(first.get().getId());
@@ -3268,7 +3268,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                                         if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                                             errorMsg += fieldName + "中" + treePath + "存在多个；";
                                                             countError++;
-                                                            valueList = Collections.emptyList();
+                                                            valueList = new ArrayList<>();
                                                         } else {
                                                             errorMsg += fieldName + " " + treePath + "Exist in multiple;";
                                                         }
@@ -3282,7 +3282,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                                     if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                                         errorMsg += fieldName + "中" + treePath + "存在多个；";
                                                         countError++;
-                                                        valueList = Collections.emptyList();
+                                                        valueList = new ArrayList<>();
                                                     } else {
                                                         errorMsg += fieldName + " " + treePath + "Not exist;";
                                                     }
@@ -3303,7 +3303,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                                     if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                                         errorMsg += fieldName + "中" + treePath + "存在多个；";
                                                         countError++;
-                                                        valueList = Collections.emptyList();
+                                                        valueList = new ArrayList<>();
                                                     } else {
                                                         errorMsg += fieldName + " " + treePath + "Exist in multiple;";
                                                     }
@@ -3317,7 +3317,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                                 if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                                     errorMsg += fieldName + "中" + treePath + "不存在；";
                                                     countError++;
-                                                    valueList = Collections.emptyList();
+                                                    valueList = new ArrayList<>();
                                                 } else {
                                                     errorMsg += fieldName + " " + treePath + "Not exist;";
                                                 }
@@ -3340,7 +3340,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                         if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                             errorMsg += fieldName + "中" + treePath + "存在多个；";
                                             countError++;
-                                            valueList = Collections.emptyList();
+                                            valueList = new ArrayList<>();
                                         } else {
                                             errorMsg += fieldName + " " + treePath + "Exist in multiple;";
                                         }
@@ -3351,7 +3351,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                     if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                         errorMsg += fieldName + "中" + treePath + "不存在；";
                                         countError++;
-                                        valueList = Collections.emptyList();
+                                        valueList = new ArrayList<>();
                                     } else {
                                         errorMsg += fieldName + " " + treePath + "Not exist;";
                                     }