diff --git a/platform-auth/src/main/java/com/eip4/platform/auth/security/SysUserService.java b/platform-auth/src/main/java/com/eip4/platform/auth/security/SysUserService.java index 84d95ae..abc2f11 100644 --- a/platform-auth/src/main/java/com/eip4/platform/auth/security/SysUserService.java +++ b/platform-auth/src/main/java/com/eip4/platform/auth/security/SysUserService.java @@ -30,10 +30,12 @@ public class SysUserService { private static final Logger log = LoggerFactory.getLogger(SysUserService.class); /** SYS_USER 取用户:按账号查(参数化),仅取认证与上下文所需列。 - * 注:MASTERDEPART 列在实际库中不存在(侦察源库确认),depart 字段固定为 null。 */ + * MASTERDEPART(主部门,引擎 CURRENTDEPART→DEPARTID 默认值)不在 SYS_USER 表、在 VIEW_SYS_USER 视图, + * 按 ACCOUNT 关联子查询取(老系统登录即从含 MASTERDEPART 的用户视图取部门,见 PublicServiceConstroller:260)。 */ private static final String SQL_FIND_BY_ACCOUNT = - "SELECT SYS_USER_ID, ACCOUNT, PASSWORD, NAME, USERORGID, STATE " - + "FROM SYS_USER WHERE ACCOUNT = ?"; + "SELECT u.SYS_USER_ID, u.ACCOUNT, u.PASSWORD, u.NAME, u.USERORGID, u.STATE, " + + "(SELECT v.MASTERDEPART FROM VIEW_SYS_USER v WHERE v.ACCOUNT = u.ACCOUNT) AS MASTERDEPART " + + "FROM SYS_USER u WHERE u.ACCOUNT = ?"; /** 角色解析:用户→用户组→角色(参数化,复刻 RoleServiceImpl 的 join)。 */ private static final String SQL_ROLES_BY_USER = @@ -64,7 +66,7 @@ public class SysUserService { trim(rs.getString("ACCOUNT")), rs.getString("PASSWORD"), rs.getString("NAME"), - null, // MASTERDEPART 列在实际库中不存在 + trim(rs.getString("MASTERDEPART")), // 主部门 → CURRENTDEPART → DEPARTID 默认(取自 VIEW_SYS_USER) trim(rs.getString("USERORGID")), rs.getInt("STATE")), account); } catch (EmptyResultDataAccessException e) {