From f25b7dcd124f16e3e450c70255476d5edbf71d69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com>
Date: Mon, 9 Sep 2024 10:47:51 +0800
Subject: [PATCH] =?UTF-8?q?fit:=20auth2=E7=99=BB=E5=BD=95data=5Fscope?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/bellmann/service/impl/AuthServiceImpl.java | 2 +-
 src/main/resources/mapper/SysUserMapper.xml                  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 @@
         <result property="status" column="status" jdbcType="BOOLEAN"/>
         <result property="deptId" column="dept_id" jdbcType="BIGINT"></result>
         <result property="groupId" column="group_id" jdbcType="BIGINT"></result>
+        <result property="dataScope" column="data_scope" jdbcType="INTEGER"></result>
         <collection property="roles" ofType="string" javaType="java.util.Set">
             <result column="code"></result>
         </collection>
@@ -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