|
|
@@ -447,6 +447,9 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
|
|
|
Long number = menuVos.stream().filter(x -> x.getParentId().equals(node.getId())).count();
|
|
|
if (number == 0 && !Objects.equals(parentId, GlobalConstant.FIRST_NODE_VALUE)) {
|
|
|
MenuVo parentMenu = getParentMenu(parentId, menuMap);
|
|
|
+ if(parentMenu == null){
|
|
|
+ return;
|
|
|
+ }
|
|
|
node.setSystemId(parentMenu.getSystemId());
|
|
|
node.setSystemName(parentMenu.getSystemName());
|
|
|
node.setParentSortCode(parentMenu.getSortCode());
|
|
|
@@ -472,6 +475,9 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
|
|
|
if (menuVo != null && GlobalConstant.FIRST_NODE_VALUE.equals(menuVo.getParentId())) {
|
|
|
return menuVo;
|
|
|
}
|
|
|
+ if(menuVo == null){
|
|
|
+ return null;
|
|
|
+ }
|
|
|
return getParentMenu(menuVo.getParentId(), menuMap);
|
|
|
}
|
|
|
|