From b148e4d35baf4d4ed0360b1069a0e3e86ddaf0ce Mon Sep 17 00:00:00 2001 From: ht <2583017235@qq.com> Date: Fri, 9 Sep 2022 15:35:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90admin?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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<>(); }