diff --git a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java index ff4fd65c..777dbf67 100644 --- a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java +++ b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java @@ -97,8 +97,8 @@ public class SysMenusController { * @return 返回菜单列表 */ @PostMapping("/tree") - public R createTree() { + public R getMenusTreeByRoleId() { SysUserVo currentUser = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY); - return R.success(sysMenuService.createTree(currentUser.getAuthorities())); + return R.success(sysMenuService.getMenusTreeByRoleId(currentUser.getAuthorities())); } } diff --git a/das/src/main/java/com/das/modules/auth/domain/vo/SysUserVo.java b/das/src/main/java/com/das/modules/auth/domain/vo/SysUserVo.java index 3a8b6bfc..08af0d96 100644 --- a/das/src/main/java/com/das/modules/auth/domain/vo/SysUserVo.java +++ b/das/src/main/java/com/das/modules/auth/domain/vo/SysUserVo.java @@ -58,8 +58,7 @@ public class SysUserVo implements Serializable { /** * 头像 */ - private String headImag; - + private String headImage; /** diff --git a/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java b/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java index 2ad03d8d..d55a1105 100644 --- a/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java +++ b/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java @@ -22,5 +22,5 @@ public interface SysMenuMapper extends BaseMapper { List queryAllMenuList(@Param("sysMenu") SysMenuQueryDto sysMenuQueryDto); - SysMenuVo createTree(); + SysMenuVo getMenusTreeByRoleId(); } diff --git a/das/src/main/java/com/das/modules/auth/service/SysMenuService.java b/das/src/main/java/com/das/modules/auth/service/SysMenuService.java index 08d1b541..79293928 100644 --- a/das/src/main/java/com/das/modules/auth/service/SysMenuService.java +++ b/das/src/main/java/com/das/modules/auth/service/SysMenuService.java @@ -30,5 +30,5 @@ public interface SysMenuService { * 构建菜单树结构 * @return 返回菜单树 */ - SysMenuVo createTree(List authorities); + SysMenuVo getMenusTreeByRoleId(List authorities); } diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java index 777e83d6..acb5d8d5 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java @@ -70,8 +70,8 @@ public class SysMenuServiceImpl implements SysMenuService { } @Override - public SysMenuVo createTree(List authorities) { - SysMenuVo root = sysMenuMapper.createTree(); + public SysMenuVo getMenusTreeByRoleId(List authorities) { + SysMenuVo root = sysMenuMapper.getMenusTreeByRoleId(); //按权限过滤菜单 filterTreeByPermissions(root,authorities); return root; diff --git a/das/src/main/resources/mapper/SysMenuMapper.xml b/das/src/main/resources/mapper/SysMenuMapper.xml index 4708b288..9ac28715 100644 --- a/das/src/main/resources/mapper/SysMenuMapper.xml +++ b/das/src/main/resources/mapper/SysMenuMapper.xml @@ -60,7 +60,7 @@ select * from sys_menu where parent_menu_id = #{id} order by menu_order - select * from sys_menu where parent_menu_id = 0 order by menu_order