Showing
1 changed file
with
4 additions
and
3 deletions
| @@ -50,11 +50,12 @@ public class SysMenuServiceImpl extends AbstractBaseService<MenuMapper, SysMenuE | @@ -50,11 +50,12 @@ public class SysMenuServiceImpl extends AbstractBaseService<MenuMapper, SysMenuE | ||
| 50 | List<MenuDTO> menuDTOs; | 50 | List<MenuDTO> menuDTOs; |
| 51 | if (isSysAdminOrPtAdmin) { | 51 | if (isSysAdminOrPtAdmin) { |
| 52 | menuDTOs = baseMapper.selectSysAdminMenu(); | 52 | menuDTOs = baseMapper.selectSysAdminMenu(); |
| 53 | - } else if (isTenantAdmin) { | ||
| 54 | - menuDTOs = baseMapper.selectTenantMenu(tenantId); | ||
| 55 | - } else { | 53 | + } else { |
| 56 | menuDTOs = baseMapper.selectMyMenu(userId); | 54 | menuDTOs = baseMapper.selectMyMenu(userId); |
| 57 | } | 55 | } |
| 56 | + if (isTenantAdmin && menuDTOs ==null) { | ||
| 57 | + menuDTOs = baseMapper.selectTenantMenu(tenantId); | ||
| 58 | + } | ||
| 58 | Map<String, MenuDTO> menuDTOMap = new LinkedHashMap<>(menuDTOs.size()); | 59 | Map<String, MenuDTO> menuDTOMap = new LinkedHashMap<>(menuDTOs.size()); |
| 59 | menuDTOs.forEach(menuDTO -> menuDTOMap.put(menuDTO.getId(), menuDTO)); | 60 | menuDTOs.forEach(menuDTO -> menuDTOMap.put(menuDTO.getId(), menuDTO)); |
| 60 | return buildMenuDTOTree(menuDTOMap, needButton); | 61 | return buildMenuDTOTree(menuDTOMap, needButton); |