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 1f9b501..3a93cbf 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 @@ -38,7 +38,7 @@ public class PreviewMenuTreeService { List menuVOList = buildMenu(prj_id, module, us,home); if (!CommUtil.isEmpty(menuVOList)) { R r = R.success(menuVOList); - if(home.getId()>0){ + if(home.getId()!=null&&home.getId()>0){ r.put("home",home); } return r; @@ -85,7 +85,7 @@ public class PreviewMenuTreeService { } public List buildMenu(String prj_id, String module, UserSession us,MenuVO home) { - Set set = RoleHelper.getMenuPlans(us.getUserId(),us.getPartyId()); + Set set = RoleHelper.isAdmin(us.getUserId()) ? MenuPlanCache.getInstance().getByP(prj_id):RoleHelper.getMenuPlans(us.getUserId(),us.getPartyId()); if (CommUtil.isEmpty(set)) { return new ArrayList<>(); }