Merge remote-tracking branch 'origin/pim_yys'

maven

3 天以前 5da5bf5cb70a889645e156eff869ff276c5a573b

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

@@ -269,4 +269,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(loginUser.getTenantId());

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

        return AjaxResult.success(sysUserList);

    }

}