1. 打开 菜单的注释代码
This commit is contained in:
parent
41012808a5
commit
99567ef161
|
|
@ -32,12 +32,11 @@ public class MenuController {
|
|||
/**
|
||||
* 获取菜单列表
|
||||
*/
|
||||
// @RequiresPermissions("system:menu:list")
|
||||
@RequiresPermissions("system:menu:list")
|
||||
@GetMapping("/list")
|
||||
public AjaxResult list(ListMenuDTO listMenu)
|
||||
{
|
||||
// Long userId = SecurityUtils.getUserId();
|
||||
Long userId = 1L;
|
||||
Long userId = SecurityUtils.getUserId();
|
||||
List<SysMenu> menus = menuService.selectMenuList(listMenu, userId);
|
||||
return AjaxResult.success(menus);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|||
import com.chushang.common.core.constant.Constants;
|
||||
import com.chushang.common.core.constant.UserConstants;
|
||||
import com.chushang.common.core.util.StringUtils;
|
||||
import com.chushang.security.utils.SecurityUtils;
|
||||
import com.chushang.system.entity.dto.ListMenuDTO;
|
||||
import com.chushang.system.entity.enums.MenuTypeEnum;
|
||||
import com.chushang.system.entity.po.SysMenu;
|
||||
|
|
@ -55,15 +56,15 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
|||
@Override
|
||||
public List<SysMenu> selectMenuList(ListMenuDTO menu, Long userId) {
|
||||
List<SysMenu> menuList;
|
||||
// if (SecurityUtils.isAdmin())
|
||||
// {
|
||||
if (SecurityUtils.isAdmin())
|
||||
{
|
||||
menuList = baseMapper.selectMenuList(menu);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// menu.getSqlParam().put("userId", userId);
|
||||
// menuList = baseMapper.selectMenuListByUserId(menu);
|
||||
// }
|
||||
}
|
||||
else
|
||||
{
|
||||
menu.getSqlParam().put("userId", userId);
|
||||
menuList = baseMapper.selectMenuListByUserId(menu);
|
||||
}
|
||||
return menuList;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue