|  | @@ -17,12 +17,8 @@ import com.ruoyi.common.constant.UserConstants;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.core.controller.BaseController;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.core.domain.AjaxResult;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.core.domain.entity.SysMenu;
 | 
	
		
			
				|  |  | -import com.ruoyi.common.core.domain.model.LoginUser;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.enums.BusinessType;
 | 
	
		
			
				|  |  | -import com.ruoyi.common.utils.SecurityUtils;
 | 
	
		
			
				|  |  | -import com.ruoyi.common.utils.ServletUtils;
 | 
	
		
			
				|  |  |  import com.ruoyi.common.utils.StringUtils;
 | 
	
		
			
				|  |  | -import com.ruoyi.framework.web.service.TokenService;
 | 
	
		
			
				|  |  |  import com.ruoyi.system.service.ISysMenuService;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  /**
 | 
	
	
		
			
				|  | @@ -37,9 +33,6 @@ public class SysMenuController extends BaseController
 | 
	
		
			
				|  |  |      @Autowired
 | 
	
		
			
				|  |  |      private ISysMenuService menuService;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    @Autowired
 | 
	
		
			
				|  |  | -    private TokenService tokenService;
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |      /**
 | 
	
		
			
				|  |  |       * 获取菜单列表
 | 
	
		
			
				|  |  |       */
 | 
	
	
		
			
				|  | @@ -47,9 +40,7 @@ public class SysMenuController extends BaseController
 | 
	
		
			
				|  |  |      @GetMapping("/list")
 | 
	
		
			
				|  |  |      public AjaxResult list(SysMenu menu)
 | 
	
		
			
				|  |  |      {
 | 
	
		
			
				|  |  | -        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
 | 
	
		
			
				|  |  | -        Long userId = loginUser.getUser().getUserId();
 | 
	
		
			
				|  |  | -        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
 | 
	
		
			
				|  |  | +        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
 | 
	
		
			
				|  |  |          return AjaxResult.success(menus);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -69,9 +60,7 @@ public class SysMenuController extends BaseController
 | 
	
		
			
				|  |  |      @GetMapping("/treeselect")
 | 
	
		
			
				|  |  |      public AjaxResult treeselect(SysMenu menu)
 | 
	
		
			
				|  |  |      {
 | 
	
		
			
				|  |  | -        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
 | 
	
		
			
				|  |  | -        Long userId = loginUser.getUser().getUserId();
 | 
	
		
			
				|  |  | -        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
 | 
	
		
			
				|  |  | +        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
 | 
	
		
			
				|  |  |          return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -81,8 +70,7 @@ public class SysMenuController extends BaseController
 | 
	
		
			
				|  |  |      @GetMapping(value = "/roleMenuTreeselect/{roleId}")
 | 
	
		
			
				|  |  |      public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
 | 
	
		
			
				|  |  |      {
 | 
	
		
			
				|  |  | -        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
 | 
	
		
			
				|  |  | -        List<SysMenu> menus = menuService.selectMenuList(loginUser.getUser().getUserId());
 | 
	
		
			
				|  |  | +        List<SysMenu> menus = menuService.selectMenuList(getUserId());
 | 
	
		
			
				|  |  |          AjaxResult ajax = AjaxResult.success();
 | 
	
		
			
				|  |  |          ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
 | 
	
		
			
				|  |  |          ajax.put("menus", menuService.buildMenuTreeSelect(menus));
 | 
	
	
		
			
				|  | @@ -105,7 +93,7 @@ public class SysMenuController extends BaseController
 | 
	
		
			
				|  |  |          {
 | 
	
		
			
				|  |  |              return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        menu.setCreateBy(SecurityUtils.getUsername());
 | 
	
		
			
				|  |  | +        menu.setCreateBy(getUsername());
 | 
	
		
			
				|  |  |          return toAjax(menuService.insertMenu(menu));
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -129,7 +117,7 @@ public class SysMenuController extends BaseController
 | 
	
		
			
				|  |  |          {
 | 
	
		
			
				|  |  |              return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败,上级菜单不能选择自己");
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        menu.setUpdateBy(SecurityUtils.getUsername());
 | 
	
		
			
				|  |  | +        menu.setUpdateBy(getUsername());
 | 
	
		
			
				|  |  |          return toAjax(menuService.updateMenu(menu));
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 |