|
@@ -97,13 +97,13 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
|
|
List<SysMenuJoinSysRoleMenu> menus = Emptys.check(workMenu.getClientType())
|
|
|
? RedisCache.getMenuTree(workMenu.getSysId(), workMenu.getClientType())
|
|
|
: 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());
|
|
|
-// }
|
|
|
+ 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 -> {
|
|
@@ -127,12 +127,12 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
|
|
List<SysMenuJoinSysRoleMenu> menus = Emptys.check(workMenu.getClientType())
|
|
|
? RedisCache.getMenu(sysId, workMenu.getClientType())
|
|
|
: RedisCache.getMenu(sysId);
|
|
|
-// if (CollUtil.isEmpty(menus)) {
|
|
|
-// RedisCache.workCache(loginId);
|
|
|
-// menus = Emptys.check(workMenu.getClientType())
|
|
|
-// ? RedisCache.getMenu(sysId, workMenu.getClientType())
|
|
|
-// : 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)));
|
|
|
if ("en".equals(lang)) {
|
|
|
//英文菜单
|