diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java index f115375..e0e95c3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java @@ -205,15 +205,18 @@ public class SysLocaleResourceService implements ISysLocaleResourceService { if(menuResourceMap != null && menuResourceMap.size() > 0 ){ for (SysMenu menu : menuList) { - if(StringUtils.isNotBlank(menu.getName())){ - String menuName = (String)menuResourceMap.get(menu.getName()); - menu.setName(StringUtils.isNotBlank(menuName) ? menuName : menu.getName()); + if(menu != null){ + if(StringUtils.isNotBlank(menu.getName())){ + String menuName = (String)menuResourceMap.get(menu.getName()); + menu.setName(StringUtils.isNotBlank(menuName) ? menuName : menu.getName()); + } + + if(StringUtils.isNotBlank(menu.getParentNameRdd())){ + String parentNameRdd = (String)menuResourceMap.get(menu.getParentNameRdd()); + menu.setParentNameRdd(StringUtils.isNotBlank(parentNameRdd) ? parentNameRdd : menu.getParentNameRdd()); + } } - if(StringUtils.isNotBlank(menu.getParentNameRdd())){ - String parentNameRdd = (String)menuResourceMap.get(menu.getParentNameRdd()); - menu.setParentNameRdd(StringUtils.isNotBlank(parentNameRdd) ? parentNameRdd : menu.getParentNameRdd()); - } } } }