兰宝车间质量管理系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
疯狂的狮子Li
2024-01-06 e7ca94bab1ef85efe4786a38669e2cca97ac406d 
 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java


@@ -6,12 +6,15 @@


import cn.hutool.core.util.ArrayUtil;


import cn.hutool.core.util.ObjectUtil;


import jakarta.servlet.http.HttpServletResponse;


import jakarta.validation.constraints.NotNull;


import lombok.RequiredArgsConstructor;


import org.dromara.common.core.constant.UserConstants;


import org.dromara.common.core.domain.R;


import org.dromara.common.core.domain.model.LoginUser;


import org.dromara.common.core.utils.MapstructUtils;


import org.dromara.common.core.utils.StreamUtils;


import org.dromara.common.core.utils.StringUtils;


import org.dromara.common.encrypt.annotation.ApiEncrypt;


import org.dromara.common.excel.core.ExcelResult;


import org.dromara.common.excel.utils.ExcelUtil;


import org.dromara.common.log.annotation.Log;


@@ -22,6 +25,8 @@


import org.dromara.common.tenant.helper.TenantHelper;


import org.dromara.common.web.core.BaseController;


import org.dromara.system.domain.bo.SysDeptBo;


import org.dromara.system.domain.bo.SysPostBo;


import org.dromara.system.domain.bo.SysRoleBo;


import org.dromara.system.domain.bo.SysUserBo;


import org.dromara.system.domain.vo.*;


import org.dromara.system.listener.SysUserImportListener;


@@ -67,9 +72,8 @@


    @SaCheckPermission("system:user:export")


    @PostMapping("/export")


    public void export(SysUserBo user, HttpServletResponse response) {


        List<SysUserVo> list = userService.selectUserList(user);


        List<SysUserExportVo> listVo = MapstructUtils.convert(list, SysUserExportVo.class);


        ExcelUtil.exportExcel(listVo, "用户数据", SysUserExportVo.class, response);


        List<SysUserExportVo> list = userService.selectUserExportList(user);


        ExcelUtil.exportExcel(list, "用户数据", SysUserExportVo.class, response);


    }




    /**


@@ -108,6 +112,9 @@


            TenantHelper.clearDynamic();


        }


        SysUserVo user = userService.selectUserById(loginUser.getUserId());


        if (ObjectUtil.isNull(user)) {


            return R.fail("没有权限访问用户数据!");


        }


        userInfoVo.setUser(user);


        userInfoVo.setPermissions(loginUser.getMenuPermission());


        userInfoVo.setRoles(loginUser.getRolePermission());


@@ -124,13 +131,17 @@


    public R<SysUserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {


        userService.checkUserDataScope(userId);


        SysUserInfoVo userInfoVo = new SysUserInfoVo();


        List<SysRoleVo> roles = roleService.selectRoleAll();


        SysRoleBo roleBo = new SysRoleBo();


        roleBo.setStatus(UserConstants.ROLE_NORMAL);


        SysPostBo postBo = new SysPostBo();


        postBo.setStatus(UserConstants.POST_NORMAL);


        List<SysRoleVo> roles = roleService.selectRoleList(roleBo);


        userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin()));


        userInfoVo.setPosts(postService.selectPostAll());


        userInfoVo.setPosts(postService.selectPostList(postBo));


        if (ObjectUtil.isNotNull(userId)) {


            SysUserVo sysUser = userService.selectUserById(userId);


            userInfoVo.setUser(sysUser);


            userInfoVo.setRoleIds(StreamUtils.toList(sysUser.getRoles(), SysRoleVo::getRoleId));


            userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId));


            userInfoVo.setPostIds(postService.selectPostListByUserId(userId));


        }


        return R.ok(userInfoVo);


@@ -143,6 +154,7 @@


    @Log(title = "用户管理", businessType = BusinessType.INSERT)


    @PostMapping


    public R<Void> add(@Validated @RequestBody SysUserBo user) {


        deptService.checkDeptDataScope(user.getDeptId());


        if (!userService.checkUserNameUnique(user)) {


            return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");


        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {


@@ -168,6 +180,7 @@


    public R<Void> edit(@Validated @RequestBody SysUserBo user) {


        userService.checkUserAllowed(user.getUserId());


        userService.checkUserDataScope(user.getUserId());


        deptService.checkDeptDataScope(user.getDeptId());


        if (!userService.checkUserNameUnique(user)) {


            return R.fail("修改用户'" + user.getUserName() + "'失败，登录账号已存在");


        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {


@@ -196,6 +209,7 @@


    /**


     * 重置密码


     */


    @ApiEncrypt


    @SaCheckPermission("system:user:resetPwd")


    @Log(title = "用户管理", businessType = BusinessType.UPDATE)


    @PutMapping("/resetPwd")


@@ -226,8 +240,9 @@


    @SaCheckPermission("system:user:query")


    @GetMapping("/authRole/{userId}")


    public R<SysUserInfoVo> authRole(@PathVariable Long userId) {


        userService.checkUserDataScope(userId);


        SysUserVo user = userService.selectUserById(userId);


        List<SysRoleVo> roles = roleService.selectRolesByUserId(userId);


        List<SysRoleVo> roles = roleService.selectRolesAuthByUserId(userId);


        SysUserInfoVo userInfoVo = new SysUserInfoVo();


        userInfoVo.setUser(user);


        userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin()));


@@ -258,4 +273,12 @@


        return R.ok(deptService.selectDeptTreeList(dept));


    }




    /**


     * 获取部门下的所有用户信息


     */


    @SaCheckPermission("system:user:list")


    @GetMapping("/list/dept/{deptId}")


    public R<List<SysUserVo>> listByDept(@PathVariable @NotNull Long deptId) {


        return R.ok(userService.selectUserListByDept(deptId));


    }


}