|
@@ -15,6 +15,7 @@ import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
@@ -63,7 +64,7 @@ public class SysMenuController extends BaseController {
|
|
|
/**
|
|
/**
|
|
|
* 获取菜单下拉树列表
|
|
* 获取菜单下拉树列表
|
|
|
*/
|
|
*/
|
|
|
- @GetMapping("/treeSelect")
|
|
|
|
|
|
|
+ @GetMapping("/tree/select")
|
|
|
public R<List<Tree<Long>>> treeSelect(SysMenu menu) {
|
|
public R<List<Tree<Long>>> treeSelect(SysMenu menu) {
|
|
|
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
|
|
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
|
|
|
return R.ok(menuService.buildMenuTreeSelect(menus));
|
|
return R.ok(menuService.buildMenuTreeSelect(menus));
|
|
@@ -78,7 +79,11 @@ public class SysMenuController extends BaseController {
|
|
|
public R<Map<String, Object>> roleMenuTreeSelect(@PathVariable("roleId") Long roleId) {
|
|
public R<Map<String, Object>> roleMenuTreeSelect(@PathVariable("roleId") Long roleId) {
|
|
|
List<SysMenu> menus = menuService.selectMenuList(getUserId());
|
|
List<SysMenu> menus = menuService.selectMenuList(getUserId());
|
|
|
Map<String, Object> ajax = new HashMap<>();
|
|
Map<String, Object> ajax = new HashMap<>();
|
|
|
- ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
|
|
|
|
|
|
|
+ if(roleId!=0){
|
|
|
|
|
+ ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
|
|
|
|
|
+ }else{
|
|
|
|
|
+ ajax.put("checkedKeys", new ArrayList<Long>());
|
|
|
|
|
+ }
|
|
|
ajax.put("menus", menuService.buildMenuTreeSelect(menus));
|
|
ajax.put("menus", menuService.buildMenuTreeSelect(menus));
|
|
|
return R.ok(ajax);
|
|
return R.ok(ajax);
|
|
|
}
|
|
}
|