diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java index 1ca781f..786b90c 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java @@ -76,7 +76,9 @@ public class PreviewMenuTreeService { public List buildMenu(String prj_id, String module, UserSession us) { Set set = MenuPlanCache.getInstance().getByP(prj_id); - if (PubUtil.isEmpty(set)) new ArrayList<>(); + if (PubUtil.isEmpty(set)) { + return new ArrayList<>(); + } MenuPlan menuPlan = set.iterator().next(); MenuPlanContent mpc = new MenuPlanContent(menuPlan.getContent()); List list = new ArrayList<>(); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanContent.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanContent.java index 1954fab..67db28d 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanContent.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanContent.java @@ -131,8 +131,13 @@ public class MenuPlanContent { if (item.getId() == id) { return item; } - if (PubUtil.isNotEmpty(item.getChildren())) { - return findById(id, item.getChildren()); + } + for (MenuPlanItem item : itemList) { + if(PubUtil.isNotEmpty(item.getChildren())){ + MenuPlanItem rt = findById(id,item.getChildren()); + if(rt!=null){ + return rt; + } } } return null;