Merge remote-tracking branch 'origin/master'

liusheng

6 天以前 36c95e19d39eb855c7a3ae23b4468d5cd3cb88ed

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -95,7 +95,8 @@


    public String loginByUserName(String userName) {
        SysUser sysUser = userService.selectUserByUserName2(userName);
        SysUser sysUser = userService.selectUserByUserNameAndDeptId(userName);
        log.info("---------sysUser的值为:{}", sysUser);
        if (ObjectUtils.isNotEmpty(sysUser)) {
            // 构建登录用户对象
            LoginUser loginUser = new LoginUser();