|
|
|
|
@ -62,7 +62,7 @@ public class SysUserController extends BaseController {
|
|
|
|
|
/**
|
|
|
|
|
* 获取用户列表
|
|
|
|
|
*/
|
|
|
|
|
@SaCheckPermission("system:user:list")
|
|
|
|
|
// @SaCheckPermission("system:user:list")
|
|
|
|
|
@GetMapping("/list")
|
|
|
|
|
public TableDataInfo<SysUserVo> list(SysUserBo user, PageQuery pageQuery) {
|
|
|
|
|
return userService.selectPageUserList(user, pageQuery);
|
|
|
|
|
@ -130,7 +130,7 @@ public class SysUserController extends BaseController {
|
|
|
|
|
*
|
|
|
|
|
* @param userId 用户ID
|
|
|
|
|
*/
|
|
|
|
|
@SaCheckPermission("system:user:query")
|
|
|
|
|
// @SaCheckPermission("system:user:query")
|
|
|
|
|
@GetMapping(value = {"/", "/{userId}"})
|
|
|
|
|
public R<SysUserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
|
|
|
|
|
SysUserInfoVo userInfoVo = new SysUserInfoVo();
|
|
|
|
|
@ -221,7 +221,7 @@ public class SysUserController extends BaseController {
|
|
|
|
|
* @param userIds 用户ID串
|
|
|
|
|
* @param deptId 部门ID
|
|
|
|
|
*/
|
|
|
|
|
@SaCheckPermission("system:user:query")
|
|
|
|
|
// @SaCheckPermission("system:user:query")
|
|
|
|
|
@GetMapping("/optionselect")
|
|
|
|
|
public R<List<SysUserVo>> optionselect(@RequestParam(required = false) Long[] userIds,
|
|
|
|
|
@RequestParam(required = false) Long deptId) {
|
|
|
|
|
@ -313,7 +313,7 @@ public class SysUserController extends BaseController {
|
|
|
|
|
*/
|
|
|
|
|
@GetMapping("/getUserList")
|
|
|
|
|
public R<List<SysUserVo>> getUserList(SysUserBo bo) {
|
|
|
|
|
List<SysUserVo> list = userService.selectUserList();
|
|
|
|
|
List<SysUserVo> list = userService.selectUserList(bo);
|
|
|
|
|
return R.ok(list);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|