简柏林 / thingskit · Commits

Commit dd0455c648d24c10c7c9b02919e32cbbc7e65f2e

Authored by 芯火源
1 parent 45a4539b

fix: 租户管理员使用用户ID获取菜单数据

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