|
@@ -186,9 +186,21 @@ public class SysMenuController {
|
|
* 根据菜单编号获取详细信息
|
|
* 根据菜单编号获取详细信息
|
|
*/
|
|
*/
|
|
@GetMapping(value = "/{getDetailInfo}")
|
|
@GetMapping(value = "/{getDetailInfo}")
|
|
- public ResponseVO getDetailInfo(Long menuId) throws CustomException {
|
|
|
|
|
|
+ public ResponseVO getDetailInfo(String menuId) throws CustomException {
|
|
try {
|
|
try {
|
|
- SysMenu sysMenu = sysMenuService.selectMenuById(menuId);
|
|
|
|
|
|
+ Long menuid;
|
|
|
|
+ if (StringUtils.isNotEmpty(menuId)) {
|
|
|
|
+ if (NumberUtil.isLong(menuId)){
|
|
|
|
+ menuid = Long.parseLong(menuId);
|
|
|
|
+ }
|
|
|
|
+ else{
|
|
|
|
+ return ResponseVO.fail("菜单id不是类型不对!");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ else{
|
|
|
|
+ return ResponseVO.fail("菜单id不能为空!");
|
|
|
|
+ }
|
|
|
|
+ SysMenu sysMenu = sysMenuService.selectMenuById(menuid);
|
|
return ResponseVO.success(sysMenu);
|
|
return ResponseVO.success(sysMenu);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
throw new CustomException("获取菜单明细异常", e);
|
|
throw new CustomException("获取菜单明细异常", e);
|
|
@@ -242,11 +254,23 @@ public class SysMenuController {
|
|
* 加载对应角色菜单列表树
|
|
* 加载对应角色菜单列表树
|
|
*/
|
|
*/
|
|
@GetMapping(value = "/roleMenuTreeselect")
|
|
@GetMapping(value = "/roleMenuTreeselect")
|
|
- public ResponseVO roleMenuTreeselect(Long roleId) throws CustomException {
|
|
|
|
|
|
+ public ResponseVO roleMenuTreeselect(String roleId) throws CustomException {
|
|
try {
|
|
try {
|
|
|
|
+ Long roleid;
|
|
|
|
+ if (StringUtils.isNotEmpty(roleId)) {
|
|
|
|
+ if (NumberUtil.isLong(roleId)){
|
|
|
|
+ roleid = Long.parseLong(roleId);
|
|
|
|
+ }
|
|
|
|
+ else{
|
|
|
|
+ return ResponseVO.fail("角色id不是类型不对!");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ else{
|
|
|
|
+ return ResponseVO.fail("角色id不能为空!");
|
|
|
|
+ }
|
|
List<SysMenu> menus = sysMenuService.selectMenuList(SecurityContextUtil.getSysUser().getId());
|
|
List<SysMenu> menus = sysMenuService.selectMenuList(SecurityContextUtil.getSysUser().getId());
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
- map.put("checkedKeys", sysMenuService.selectMenuListByRoleId(roleId));
|
|
|
|
|
|
+ map.put("checkedKeys", sysMenuService.selectMenuListByRoleId(roleid));
|
|
map.put("menus", sysMenuService.buildMenuTreeSelect(menus));
|
|
map.put("menus", sysMenuService.buildMenuTreeSelect(menus));
|
|
return ResponseVO.success(map);
|
|
return ResponseVO.success(map);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|