diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index 5f36f0cd..94a225ab 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -62,7 +62,7 @@ public class SysUserController extends BaseController { /** * 获取用户列表 */ - @SaCheckPermission("system:user:list") +// @SaCheckPermission("system:user:list") @GetMapping("/list") public TableDataInfo 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 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> optionselect(@RequestParam(required = false) Long[] userIds, @RequestParam(required = false) Long deptId) { @@ -313,7 +313,7 @@ public class SysUserController extends BaseController { */ @GetMapping("/getUserList") public R> getUserList(SysUserBo bo) { - List list = userService.selectUserList(); + List list = userService.selectUserList(bo); return R.ok(list); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java index 28d44d59..dbf78d3d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -280,7 +280,7 @@ public interface ISysUserService { * * @return 用户信息集合信息 */ - public List selectUserList(); + public List selectUserList(SysUserBo user); /** * 通过部门ID和角色名查询用户列表 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index b59d5b01..1033f8a6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -681,18 +681,18 @@ public class SysUserServiceImpl implements ISysUserService { return ObjectUtils.notNullGetter(sysUser, SysUser::getEmail); } - /** * 查询所有用户 * * @return 用户信息集合信息 */ @Override - public List selectUserList() { + public List selectUserList(SysUserBo user) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(SysUser::getNickName); return baseMapper.selectVoList(lqw); } + /** * 通过部门ID和角色名查询用户列表 *