From 79feab31fc9edbb22d249b5946baa2d87dc3f80b Mon Sep 17 00:00:00 2001
From: "feng.liu" <123456>
Date: Tue, 12 Jul 2022 14:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B2=A1=E6=9C=89=E7=88=B6?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=9A=84=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/busi/SysMenuController.java         | 26 ++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java
index 7bc7fec..543fa1a 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java
@@ -44,6 +44,7 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.OutputStream;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -375,16 +376,23 @@ public class SysMenuController extends CrudBaseController<SysMenu> {
 
             });
 
-            list.forEach(menu -> {
-                menu.setIsDeleted(CommonEnumUtil.IS_DEAL.NO.getValue());
-                menu.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
-                if(menu.getParentId().longValue() != -1){
-                    SysMenu mu = map.get(menu.getParentId().toString());
-                    ValidatorBean.checkNotNull(mu, "【"+menu.getParentId()+"】不存在的父节点信息");
-                    menu.setNameZhShortening(StringTool.getAllFirstLetter(mu.getName()));
-                    menu.setParentNameRdd(mu.getName());
+            Iterator<SysMenu> it = list.iterator();
+            while(it.hasNext()){
+                SysMenu sysMenu = it.next();
+                sysMenu.setIsDeleted(CommonEnumUtil.IS_DEAL.NO.getValue());
+                sysMenu.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
+                if(sysMenu.getParentId().longValue() != -1){
+                    SysMenu mu = map.get(sysMenu.getParentId().toString());
+                    //ValidatorBean.checkNotNull(mu, "【"+menu.getParentId()+"】不存在的父节点信息");
+                    if(mu == null){
+                        LOGGER.error("{}, 不存在的父节点信息", sysMenu.getParentId());
+                        it.remove();
+                    }else{
+                        sysMenu.setNameZhShortening(StringTool.getAllFirstLetter(mu.getName()));
+                        sysMenu.setParentNameRdd(mu.getName());
+                    }
                 }
-            });
+            }
 
             return ResultBean.success("上传成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
                                 .setResultList(menuService.saveBatch(list));