|
|
|
@ -1,4 +1,4 @@ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
package com.gaotao.modules.sys.controller; |
|
|
|
|
|
|
|
@ -21,7 +21,7 @@ import java.util.Map; |
|
|
|
/** |
|
|
|
* 角色管理 |
|
|
|
* |
|
|
|
* |
|
|
|
* |
|
|
|
*/ |
|
|
|
@RestController |
|
|
|
@RequestMapping("/sys/role") |
|
|
|
@ -37,44 +37,44 @@ public class SysRoleController extends AbstractController { |
|
|
|
@GetMapping("/list") |
|
|
|
public R list(@RequestParam Map<String, Object> params){ |
|
|
|
//如果不是超级管理员,则只查询自己创建的角色列表 |
|
|
|
if(getUserId() != Constant.SUPER_ADMIN){ |
|
|
|
params.put("createUserId", getUserId()); |
|
|
|
} |
|
|
|
// if(getUserId() != Constant.SUPER_ADMIN){ |
|
|
|
// params.put("createUserId", getUserId()); |
|
|
|
// } |
|
|
|
|
|
|
|
PageUtils page = sysRoleService.queryPage(params); |
|
|
|
return R.ok().put("page", page); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* 角色列表 |
|
|
|
*/ |
|
|
|
@GetMapping("/select") |
|
|
|
public R select(){ |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
|
|
|
|
|
|
|
|
//如果不是超级管理员,则只查询自己所拥有的角色列表 |
|
|
|
// if(getUserId() != Constant.SUPER_ADMIN){ |
|
|
|
// map.put("create_user_id", getUserId()); |
|
|
|
// } |
|
|
|
List<SysRoleEntity> list = (List<SysRoleEntity>) sysRoleService.listByMap(map); |
|
|
|
|
|
|
|
|
|
|
|
return R.ok().put("list", list); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* 角色信息 |
|
|
|
*/ |
|
|
|
@GetMapping("/info/{roleId}") |
|
|
|
public R info(@PathVariable("roleId") Long roleId){ |
|
|
|
SysRoleEntity role = sysRoleService.getById(roleId); |
|
|
|
|
|
|
|
|
|
|
|
//查询角色对应的菜单 |
|
|
|
List<String> menuIdList = sysRoleMenuService.queryMenuIdList(roleId); |
|
|
|
role.setMenuIdList(menuIdList); |
|
|
|
|
|
|
|
|
|
|
|
return R.ok().put("role", role); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* 保存角色 |
|
|
|
*/ |
|
|
|
@ -82,13 +82,13 @@ public class SysRoleController extends AbstractController { |
|
|
|
@PostMapping("/save") |
|
|
|
public R save(@RequestBody SysRoleEntity role){ |
|
|
|
ValidatorUtils.validateEntity(role); |
|
|
|
|
|
|
|
|
|
|
|
role.setCreateUserId(getUserId()); |
|
|
|
sysRoleService.saveRole(role); |
|
|
|
|
|
|
|
|
|
|
|
return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* 修改角色 |
|
|
|
*/ |
|
|
|
@ -96,13 +96,13 @@ public class SysRoleController extends AbstractController { |
|
|
|
@PostMapping("/update") |
|
|
|
public R update(@RequestBody SysRoleEntity role){ |
|
|
|
ValidatorUtils.validateEntity(role); |
|
|
|
|
|
|
|
|
|
|
|
role.setCreateUserId(getUserId()); |
|
|
|
sysRoleService.update(role); |
|
|
|
|
|
|
|
|
|
|
|
return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* 删除角色 |
|
|
|
*/ |
|
|
|
@ -110,7 +110,7 @@ public class SysRoleController extends AbstractController { |
|
|
|
@PostMapping("/delete") |
|
|
|
public R delete(@RequestBody Long[] roleIds){ |
|
|
|
sysRoleService.deleteBatch(roleIds); |
|
|
|
|
|
|
|
|
|
|
|
return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); |
|
|
|
} |
|
|
|
} |