diff --git a/src/main/java/com/bellmann/service/impl/AuthServiceImpl.java b/src/main/java/com/bellmann/service/impl/AuthServiceImpl.java index f5a96ea..4e3183a 100644 --- a/src/main/java/com/bellmann/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/bellmann/service/impl/AuthServiceImpl.java @@ -114,7 +114,7 @@ public class AuthServiceImpl implements AuthService { LdapStaffVo ldapStaffVo = tokenResponse.getUser(); // 获取到用户信息, 模拟登录 - UserAuthInfo user = userMapper.getUserAuthInfo(ldapStaffVo.getStaffAccount()); + UserAuthInfo user = userMapper.getUserAuthInfo(ldapStaffVo.getRelaStaffAccount()); SysUserDetails userDetails = new SysUserDetails(user); // UsernamePasswordAuthenticationToken authenticationToken = // new UsernamePasswordAuthenticationToken(ldapStaffVo.getStaffName().toLowerCase().trim(), diff --git a/src/main/resources/mapper/SysUserMapper.xml b/src/main/resources/mapper/SysUserMapper.xml index 045d3be..741d24f 100644 --- a/src/main/resources/mapper/SysUserMapper.xml +++ b/src/main/resources/mapper/SysUserMapper.xml @@ -99,6 +99,7 @@ + @@ -114,7 +115,8 @@ t1.STATUS, t1.dept_id , t1.domain_group_id group_id, - t3.CODE + t3.CODE, + t3.data_scope FROM sys_user t1 LEFT JOIN sys_user_role t2 ON t2.user_id = t1.id