From 4ed719fc4d220309554608e7a2b1f7338ab24d69 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Fri, 12 Jun 2026 13:53:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95:=20=E4=BB=8E=20VIEW=5FSYS=5F?= =?UTF-8?q?USER=20=E5=8F=96=20MASTERDEPART(=E5=8E=9F=E5=86=99=E6=AD=BB=20n?= =?UTF-8?q?ull=20=E8=87=B4=20DEPARTID=20=E5=BF=85=E5=A1=AB=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 原注释"MASTERDEPART 列不存在"看错表——该列在 VIEW_SYS_USER 视图(不在 SYS_USER 表)。 按 ACCOUNT 关联子查询取,principal.depart 经 JWT 透传→EngineContextBinder 绑 CURRENTDEPART→引擎 setStandardDefaults 填 DEPARTID。实测 ceshi 添加通知 departid 非空。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../eip4/platform/auth/security/SysUserService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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) {