From 0106517804b17c0d2811c59eedbec6867f7a2e8e Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Tue, 16 May 2023 16:35:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D[=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E4=BF=9D=E5=AD=98=E7=9A=84=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE]Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/sys/controller/MenuEOController.java | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java index 1b63841..cd7481c 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java @@ -157,21 +157,12 @@ public class MenuEOController extends BaseController { if (roleId != null && !"".equals(roleId)) { roleMenuEOPage.setRoleId(roleId); - RoleEO roleEO = roleEOService.selectByPrimaryKey(roleId); - if ("管理员".equals(roleEO.getName())) { - menuVOs.forEach(menuVO -> { - if (!"1".equals(menuVO.getIsButton())) { - menuVO.setBelong(IsBelongEnum.BELONG.getValue()); - } - }); - }else{ - List roleMenuEOList =roleMenuEOService.queryByList(roleMenuEOPage); - for (MenuVO menuVO : menuVOs) { - for (RoleMenuEO roleMenuEO : roleMenuEOList){ - if (StringUtils.equals(menuVO.getId(),roleMenuEO.getMenuId()) && !"1".equals(menuVO.getIsButton())){ - menuVO.setBelong(IsBelongEnum.BELONG.getValue()); - break; - } + List roleMenuEOList =roleMenuEOService.queryByList(roleMenuEOPage); + for (MenuVO menuVO : menuVOs) { + for (RoleMenuEO roleMenuEO : roleMenuEOList){ + if (StringUtils.equals(menuVO.getId(),roleMenuEO.getMenuId())){ + menuVO.setBelong(IsBelongEnum.BELONG.getValue()); + break; } } }