From eeeddf0836a5a5aa03a3342d34318c7202313e93 Mon Sep 17 00:00:00 2001 From: 唐耀东 <18861537@qq.com> Date: 星期四, 09 十二月 2021 15:02:30 +0800 Subject: [PATCH] 提交代码 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 194c993..307ab4d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -3,6 +3,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; @@ -63,6 +65,16 @@ return userService.selectPageUserList(user); } + /** + * 鏈烘瀯鎴愬憳锛堟棤鏉冮檺锛� + */ + @ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃") + @GetMapping("/byDept") + public AjaxResult byDept(@RequestParam Long deptId, @RequestParam int pageNum, @RequestParam int pageSize) { + Page<SysUser> page = new Page<SysUser>(pageNum, pageSize); + return AjaxResult.success(userService.pageList(page, deptId)); + } + @ApiOperation("瀵煎嚭鐢ㄦ埛鍒楄〃") @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:user:export')") @@ -75,7 +87,6 @@ SysUserExportVo vo = listVo.get(i); if (ObjectUtil.isNotEmpty(dept)) { vo.setDeptName(dept.getDeptName()); - vo.setLeader(dept.getLeader()); } } ExcelUtil.exportExcel(listVo, "鐢ㄦ埛鏁版嵁", SysUserExportVo.class, response); @@ -228,4 +239,9 @@ userService.insertUserAuth(userId, roleIds); return success(); } + + @GetMapping("/select") + public AjaxResult selectList() { + return AjaxResult.success(userService.list(new QueryWrapper<SysUser>().lambda().eq(SysUser::getStatus, 0))); + } } -- Gitblit v1.9.1