Merge remote-tracking branch 'origin/dev_tide' into dev_tide

maven

3 天以前 a20dad0f0702e192bee8b80c6237a0e9bb7d8b66

 src/main/java/com/ruoyi/project/system/controller/SysUserController.java

@@ -114,7 +114,8 @@
        }

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

        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));

        ajax.put("posts", postService.selectPostAll());

//        ajax.put("posts", postService.selectPostAll());

        ajax.put("posts", postService.selectPostByTenantId(SecurityUtils.getLoginUser().getTenantId()));

        SysUserDeptVo sysUserDeptVo = new SysUserDeptVo();

        sysUserDeptVo.setUserId(userId);

        List<SysUserDeptVo> sysUserDeptVos = userDeptService.userLoginFacotryList(sysUserDeptVo);

@@ -144,6 +145,7 @@
            return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");

        }

        user.setCreateBy(getUsername());

        user.setTenantId(SecurityUtils.getLoginUser().getTenantId());

        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));

        return toAjax(userService.insertUser(user));

    }

@@ -269,4 +271,18 @@
        List<SysUser> sysUserList = userService.userListNoPage(user);

        return AjaxResult.success(sysUserList);

    }



    /**

     * 查询当前用户公司下所有用户

     * @param user

     * @return

     */

    @GetMapping("/userListNoPageByTenantId")

    public AjaxResult userListNoPageByTenantId(SysUser user){

        //获取登录用户信息

//        SysUser loginUser = SecurityUtils.getLoginUser().getUser();

        user.setTenantId(SecurityUtils.getLoginUser().getTenantId());

        List<SysUser> sysUserList = userService.userListNoPage(user);

        return AjaxResult.success(sysUserList);

    }

}