【丽水】角色管理-校验功能增加orgid

陈昶聿

10 小时以前 ca11d871c67ca9e1668193b95fbdc2bd9a18a280

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -125,7 +125,16 @@
        log.info("--------userId的值为：{}", userId);
        userService.checkUserDataScope(userId);
        AjaxResult ajax = AjaxResult.success();
        List<SysRole> roles = roleService.selectRoleAll();

        LoginUser loginUser = getLoginUser();
        SysUser user = loginUser.getUser();
        log.info("--------user的值为：{}", user);

        SysRole roleVo = new SysRole();
        roleVo.setOrgid(user.getOrgid());
        List<SysRole> roles = roleService.selectRoleList(roleVo);
        log.info("--------roles的值为：{}", roles);

        ajax.put("roles", isAdmin.contains(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
        ajax.put("posts", postService.selectPostAll());
        if (StringUtils.isNotNull(userId)) {
@@ -139,9 +148,7 @@
        SysUserDept sysUserDept = new SysUserDept();
        sysUserDept.setUserId(userId);
        sysUserDept.setDeptType("1");
        LoginUser loginUser = getLoginUser();
        SysUser user = loginUser.getUser();
        log.info("--------user的值为：{}", user);

        sysUserDept.setOrgid(user.getOrgid());
        sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
        ajax.put("belongDepts", sysUserDeptKSs);