Merge remote-tracking branch 'origin/master'

maven

5 天以前 5323d2e4d07d5ceaaae6a5bf12254641a2d77174

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

@@ -117,7 +117,7 @@
        ajax.put("posts", postService.selectPostAll());

        SysUserDeptVo sysUserDeptVo = new SysUserDeptVo();

        sysUserDeptVo.setUserId(userId);

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

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

        ajax.put("deptIds",sysUserDeptVos.stream().map(SysUserDeptVo::getDeptId).collect(Collectors.toList()));

        return ajax;

    }