|
@@ -97,15 +97,6 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
|
List<SysMenuJoinSysRoleMenu> menus = Emptys.check(workMenu.getClientType())
|
|
List<SysMenuJoinSysRoleMenu> menus = Emptys.check(workMenu.getClientType())
|
|
? RedisCache.getMenuTree(workMenu.getSysId(), workMenu.getClientType())
|
|
? RedisCache.getMenuTree(workMenu.getSysId(), workMenu.getClientType())
|
|
: RedisCache.getMenuTree(workMenu.getSysId());
|
|
: RedisCache.getMenuTree(workMenu.getSysId());
|
|
-// if (CollUtil.isEmpty(menus)) {
|
|
|
|
-// Long loginId = AuthorizeUtils.getLoginId(Long.class);
|
|
|
|
-// RedisCache.workCache(loginId);
|
|
|
|
-// menus = Emptys.check(workMenu.getClientType())
|
|
|
|
-// ? RedisCache.getMenuTree(workMenu.getSysId(), workMenu.getClientType())
|
|
|
|
-// : RedisCache.getMenuTree(workMenu.getSysId());
|
|
|
|
-// }
|
|
|
|
-
|
|
|
|
-
|
|
|
|
menus.forEach(sysMenuJoinSysRoleMenu -> {
|
|
menus.forEach(sysMenuJoinSysRoleMenu -> {
|
|
SysMenuDto.Vo vo = copy(SysMenuDto.Vo.class, sysMenuJoinSysRoleMenu);
|
|
SysMenuDto.Vo vo = copy(SysMenuDto.Vo.class, sysMenuJoinSysRoleMenu);
|
|
List<SysMenuDto.Vo> sonVos = copy(SysMenuDto.Vo.class, sysMenuJoinSysRoleMenu.getSonSysMenu());
|
|
List<SysMenuDto.Vo> sonVos = copy(SysMenuDto.Vo.class, sysMenuJoinSysRoleMenu.getSonSysMenu());
|
|
@@ -127,12 +118,6 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
|
List<SysMenuJoinSysRoleMenu> menus = Emptys.check(workMenu.getClientType())
|
|
List<SysMenuJoinSysRoleMenu> menus = Emptys.check(workMenu.getClientType())
|
|
? RedisCache.getMenu(sysId, workMenu.getClientType())
|
|
? RedisCache.getMenu(sysId, workMenu.getClientType())
|
|
: RedisCache.getMenu(sysId);
|
|
: RedisCache.getMenu(sysId);
|
|
-// if (CollUtil.isEmpty(menus)) {
|
|
|
|
-// RedisCache.workCache(loginId);
|
|
|
|
-// menus = Emptys.check(workMenu.getClientType())
|
|
|
|
-// ? RedisCache.getMenu(sysId, workMenu.getClientType())
|
|
|
|
-// : RedisCache.getMenu(sysId);
|
|
|
|
-// }
|
|
|
|
menus.forEach(sysMenuJoinSysRoleMenu -> list.add(copy(SysMenuDto.Vo.class, sysMenuJoinSysRoleMenu)));
|
|
menus.forEach(sysMenuJoinSysRoleMenu -> list.add(copy(SysMenuDto.Vo.class, sysMenuJoinSysRoleMenu)));
|
|
if ("en".equals(lang)) {
|
|
if ("en".equals(lang)) {
|
|
//英文菜单
|
|
//英文菜单
|