CRUD QA:DEPARTID/ORGID 统一解析部门/组织名(OA/HR 列表显裸 id 根因)
只读巡检(25实体)揪出最广泛缺陷:OA/HR 实体 DEPARTID/ORGID 元数据登记为 NVARCHAR(字符串码、 非外键)→ referenceid 链漏掉 → 永不产生 _DISPLAY__ → 列表全显裸 id(而 PM 配真 UUID 引用就正常)。 其值实为 SYS_DEPART/SYS_ORG 主键(全库通用)。queryRefColumns 按列名补 DEPARTID/HISDEPARTID→SYS_DEPART、 ORGID→SYS_ORG(不覆盖已配真外键的 PM),与 SYS_USER 特例同模式。实证:OA_NOTICEMANAGE DEPARTID_DISPLAY__ ='项目一组'/ORGID='五建集团',OA/HR/PM 一致。UserColumnResolverTest 9 测绿。 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -166,6 +166,7 @@ public class UserColumnResolver {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, RefTarget> queryRefColumns(String upperTable) {
|
private Map<String, RefTarget> queryRefColumns(String upperTable) {
|
||||||
|
Map<String, RefTarget> map = new LinkedHashMap<>();
|
||||||
try {
|
try {
|
||||||
List<Map<String, Object>> rows = jdbcTemplate.queryForList(
|
List<Map<String, Object>> rows = jdbcTemplate.queryForList(
|
||||||
"SELECT UPPER(ea.columnname) AS col, UPPER(e2.tablename) AS target "
|
"SELECT UPPER(ea.columnname) AS col, UPPER(e2.tablename) AS target "
|
||||||
@@ -175,10 +176,6 @@ public class UserColumnResolver {
|
|||||||
+ "JOIN eip3.sys_entity e2 ON UPPER(e2.sys_entity_id) = UPPER(r.entityid) "
|
+ "JOIN eip3.sys_entity e2 ON UPPER(e2.sys_entity_id) = UPPER(r.entityid) "
|
||||||
+ "WHERE UPPER(e1.tablename) = ?",
|
+ "WHERE UPPER(e1.tablename) = ?",
|
||||||
upperTable);
|
upperTable);
|
||||||
if (rows.isEmpty()) {
|
|
||||||
return Collections.emptyMap();
|
|
||||||
}
|
|
||||||
Map<String, RefTarget> map = new LinkedHashMap<>();
|
|
||||||
for (Map<String, Object> r : rows) {
|
for (Map<String, Object> r : rows) {
|
||||||
String col = String.valueOf(r.get("col"));
|
String col = String.valueOf(r.get("col"));
|
||||||
String target = String.valueOf(r.get("target"));
|
String target = String.valueOf(r.get("target"));
|
||||||
@@ -187,12 +184,33 @@ public class UserColumnResolver {
|
|||||||
map.put(col, t);
|
map.put(col, t);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
log.debug("[REF-COL] table={} refColumns={}", upperTable, map.keySet());
|
|
||||||
return map;
|
|
||||||
} catch (org.springframework.dao.DataAccessException ex) {
|
} catch (org.springframework.dao.DataAccessException ex) {
|
||||||
// 元数据查询异常 → 视作无引用列,绝不影响主读路径
|
// 元数据查询异常 → 不阻断,继续补众所周知列;绝不影响主读路径
|
||||||
log.warn("[REF-COL] 解析引用列失败 table={}: {}", upperTable, ex.getMessage());
|
log.warn("[REF-COL] 解析引用列失败 table={}: {}", upperTable, ex.getMessage());
|
||||||
return Collections.emptyMap();
|
}
|
||||||
|
// 补众所周知的部门/组织引用列:DEPARTID/HISDEPARTID/ORGID 在 OA/HR 实体元数据里被登记为 NVARCHAR
|
||||||
|
// (字符串类型码、非外键)→ 上面 referenceid 链漏掉,但其值实为 SYS_DEPART/SYS_ORG 主键(全库通用,
|
||||||
|
// 拟稿人部门/组织)。按列名约定统一解析,使 OA/HR/PM 一致显部门/组织名(dogfooding:OA/HR 列表显裸 id 根因)。
|
||||||
|
try {
|
||||||
|
Set<String> srcPhys = physColsCache.get(upperTable, this::queryPhysicalColumns);
|
||||||
|
addWellKnownRefCol(map, srcPhys, "DEPARTID", "SYS_DEPART");
|
||||||
|
addWellKnownRefCol(map, srcPhys, "HISDEPARTID", "SYS_DEPART");
|
||||||
|
addWellKnownRefCol(map, srcPhys, "ORGID", "SYS_ORG");
|
||||||
|
} catch (RuntimeException ignore) {
|
||||||
|
// 补列失败不影响已有解析
|
||||||
|
}
|
||||||
|
log.debug("[REF-COL] table={} refColumns={}", upperTable, map.keySet());
|
||||||
|
return map.isEmpty() ? Collections.emptyMap() : map;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 按列名补众所周知引用列(源表确有该物理列、且未被 referenceid 解析覆盖 → 不动 PM 等已配真外键的)。 */
|
||||||
|
private void addWellKnownRefCol(Map<String, RefTarget> map, Set<String> srcPhys, String col, String targetTable) {
|
||||||
|
if (map.containsKey(col) || srcPhys == null || !srcPhys.contains(col)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
RefTarget t = targetMetaCache.get(targetTable, this::resolveTargetMeta);
|
||||||
|
if (t != null) {
|
||||||
|
map.put(col, t);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user