diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index a0be167..e1a743a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -119,12 +119,12 @@ public class AuthController extends CoreBaseController { if(menus != null){ // 封装模块信息 for (SysMenu menu : menus) { - if(menu.getMenuType().equals(CommonEnumUtil.METHOD_LEVEL.MODULE.getValue()) + if(menu != null && menu.getMenuType().equals(CommonEnumUtil.METHOD_LEVEL.MODULE.getValue()) && parentId.equals(menu.getParentId().toString())){ // 封装 功能信息 for (SysMenu sysMenu : menus) { - if(sysMenu.getMenuType().equals(CommonEnumUtil.METHOD_LEVEL.METHOD.getValue()) + if (sysMenu != null && sysMenu.getMenuType().equals(CommonEnumUtil.METHOD_LEVEL.METHOD.getValue()) && menu.getId().longValue() == sysMenu.getParentId().longValue()){ if(!menu.getChildList().contains(sysMenu)){ menu.getChildList().add(sysMenu);