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; } } }