lbqms.git - Gitblit

			@@ -2,13 +2,14 @@

			import cn.dev33.satoken.annotation.SaCheckPermission;
			import cn.hutool.core.lang.tree.Tree;
			import com.ruoyi.common.annotation.Log;
			import com.ruoyi.common.constant.UserConstants;
			import com.ruoyi.common.core.controller.BaseController;
			import com.ruoyi.common.log.annotation.Log;
			import com.ruoyi.common.core.constant.UserConstants;
			import com.ruoyi.common.core.web.controller.BaseController;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.satoken.utils.LoginHelper;
			import com.ruoyi.system.domain.SysMenu;
			import com.ruoyi.common.enums.BusinessType;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.common.log.enums.BusinessType;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.system.service.ISysMenuService;
			import lombok.RequiredArgsConstructor;
			import org.springframework.validation.annotation.Validated;
			@@ -37,7 +38,7 @@
			@SaCheckPermission("system:menu:list")
			@GetMapping("/list")
			public R<List<SysMenu>> list(SysMenu menu) {
			List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
			List<SysMenu> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
			return R.ok(menus);
			}

			@@ -57,7 +58,7 @@
			*/
			@GetMapping("/treeselect")
			public R<List<Tree<Long>>> treeselect(SysMenu menu) {
			List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
			List<SysMenu> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
			return R.ok(menuService.buildMenuTreeSelect(menus));
			}

			@@ -68,7 +69,7 @@
			*/
			@GetMapping(value = "/roleMenuTreeselect/{roleId}")
			public R<Map<String, Object>> roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
			List<SysMenu> menus = menuService.selectMenuList(getUserId());
			List<SysMenu> menus = menuService.selectMenuList(LoginHelper.getUserId());
			Map<String, Object> ajax = new HashMap<>();
			ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
			ajax.put("menus", menuService.buildMenuTreeSelect(menus));