diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/EntityWriteController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/EntityWriteController.java
index 7ab6d88..a754329 100644
--- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/EntityWriteController.java
+++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/EntityWriteController.java
@@ -17,6 +17,7 @@ import com.dsasp.server.common.dataDic.service.POJOCRUDService;
import com.dsasp.server.common.exception.PrivilegeException;
import com.dsasp.server.common.util.UserSession;
import com.eip4.platform.metadata.security.IdentifierWhitelist;
+import com.eip4.platform.metadata.write.MandatoryUserColumnFiller;
import com.eip4.platform.metadata.write.WritePrivilegeChecker;
import io.swagger.v3.oas.annotations.Operation;
@@ -49,13 +50,16 @@ public class EntityWriteController {
private final POJOCRUDService pojoCRUDService;
private final IdentifierWhitelist identifierWhitelist;
private final WritePrivilegeChecker writePrivilegeChecker;
+ private final MandatoryUserColumnFiller mandatoryUserColumnFiller;
public EntityWriteController(POJOCRUDService pojoCRUDService,
IdentifierWhitelist identifierWhitelist,
- WritePrivilegeChecker writePrivilegeChecker) {
+ WritePrivilegeChecker writePrivilegeChecker,
+ MandatoryUserColumnFiller mandatoryUserColumnFiller) {
this.pojoCRUDService = pojoCRUDService;
this.identifierWhitelist = identifierWhitelist;
this.writePrivilegeChecker = writePrivilegeChecker;
+ this.mandatoryUserColumnFiller = mandatoryUserColumnFiller;
}
/**
@@ -99,6 +103,9 @@ public class EntityWriteController {
if (pkVal != null && !pkVal.toString().isBlank()) {
saved = pojoCRUDService.update(normalized, t, ctx);
} else {
+ // 新增路径:回填缺失的「必填用户引用列」(如 OA_NOTICEMANAGE.USER_ID 拟稿人=当前用户),
+ // 否则引擎必填校验抛「…是必填项」→ 422。仅缺失才填、绝不覆盖用户显式传值。
+ mandatoryUserColumnFiller.fillForInsert(t, normalized, ctx);
saved = pojoCRUDService.save(normalized, t, ctx);
}
String savedId = saved != null ? saved.get_ID() : null;
diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/write/MandatoryUserColumnFiller.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/write/MandatoryUserColumnFiller.java
new file mode 100644
index 0000000..1a0d58e
--- /dev/null
+++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/write/MandatoryUserColumnFiller.java
@@ -0,0 +1,147 @@
+package com.eip4.platform.metadata.write;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import com.dsasp.server.common.user.service.LoggedInUser;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
+/**
+ * F2 写侧缺陷修复:新增时自动回填「必填的用户引用列」为当前登录用户。
+ *
+ *
背景缺陷:{@code POST /api/entity/OA_NOTICEMANAGE/save} 新增通知返回
+ * 422「拟稿人是必填项」。{@code OA_NOTICEMANAGE.USER_ID}(displayname=拟稿人)元数据
+ * {@code ismandatory=1} 且 {@code referenceid→SYS_USER},但语义是「拟稿人=起草人=当前用户」,
+ * 表单不出现该字段、也不该手填。引擎 {@code GeneralPO.setStandardDefaults()} 只对
+ * 审计列(CREATEBY/UPDATEBY/CREATETIME/UPDATETIME/DEPARTID/ORGID/ISACTIVE/VERSION)
+ * 兜底当前用户/默认值,不认识「拟稿人」类业务用户引用列,故 USER_ID 保持 null,
+ * 命中 {@code GeneralPO.set_Value} 的必填校验({@code "...是必填项"})→ ValidationException → 422。
+ *
+ *
填充规则(元数据驱动、缺失才填、绝不覆盖):
+ *
+ * - 仅新增路径(无主键)调用——更新场景拟稿人已固化,不动。
+ * - 列必须是「必填的用户引用列」:{@code SYS_ENTITYATTRIBUTE.ismandatory=1} 且
+ * {@code referenceid → SYS_REFERENCE → SYS_ENTITY.tablename ∈ {SYS_USER, VIEW_SYS_USER}}
+ * (与 {@link com.eip4.platform.metadata.flow.UserColumnResolver#queryUserColumns} 同口径,
+ * 仅多一道 {@code ismandatory=1} 收口,避免误伤可选的「指派人/审批人/接收人」类用户列)。
+ * - 排除 {@code CREATEBY}/{@code UPDATEBY}:引擎 {@code setStandardDefaults} 已兜底,重复填多余。
+ * - 仅当提交体里该列缺失/空白才填——用户若显式给了值(如代起草指定他人),保留原值不覆盖。
+ *
+ *
+ * 范围与风险:全库实测「必填用户引用列(除 CREATEBY/UPDATEBY)」共 207 列 / 189 表。
+ * 本填充器是通用规则而非 OA_NOTICEMANAGE 窄修,但靠「缺失才填、绝不覆盖、仅新增」
+ * 三重收口把风险压到最低:它只在「必填用户列且用户没传」时补当前用户,等价于「起草人=当前用户」
+ * 的通用语义;任何显式传值或更新场景都不受影响。OA_NOTICEMANAGE 仅 USER_ID 命中。
+ *
+ *
缓存:表名(大写)→ 待回填列名集合(大写),与 {@link com.eip4.platform.metadata.flow.UserColumnResolver}
+ * 同 Caffeine 策略;空集合亦缓存避免重复查元数据。元数据/用户变更后由 {@link #evictAll()} 失效
+ * (对齐 {@code /api/meta/evict} 钩子口径)。
+ *
+ *
纪律:零改 {@code com.dsasp};只查元数据不裸写业务表,写仍全走引擎 save。
+ */
+@Component
+public class MandatoryUserColumnFiller {
+
+ private static final Logger log = LoggerFactory.getLogger(MandatoryUserColumnFiller.class);
+
+ private final JdbcTemplate jdbcTemplate;
+
+ /** 表名(大写)→ 必填用户引用列名集合(大写,已排除 CREATEBY/UPDATEBY)。空集合亦缓存。 */
+ private final Cache> mandatoryUserColumnsByTable = Caffeine.newBuilder()
+ .maximumSize(2_000)
+ .build();
+
+ public MandatoryUserColumnFiller(JdbcTemplate jdbcTemplate) {
+ this.jdbcTemplate = jdbcTemplate;
+ }
+
+ /**
+ * 新增路径就地回填:把提交体里缺失/空白的「必填用户引用列」填为当前登录用户 id。
+ *
+ * 仅在新增(无主键)时调用。会就地修改 {@code body}。
+ *
+ * @param table 实体表名(任意大小写;null/空 → 跳过)
+ * @param body 归一化为大写键的提交体({@code EntityWriteController.normalizeKeys} 之后),会被就地修改
+ * @param ctx 当前请求引擎上下文(取 {@code CURRENTUSER})
+ */
+ public void fillForInsert(String table, Map body, Properties ctx) {
+ if (table == null || table.isBlank() || body == null || ctx == null) {
+ return;
+ }
+ Set cols = mandatoryUserColumnsForTable(table);
+ if (cols.isEmpty()) {
+ return;
+ }
+ String currentUser = ctx.getProperty(LoggedInUser.CURRENTUSER, "");
+ if (currentUser == null || currentUser.isBlank()) {
+ // 未绑定登录用户(异常/匿名)→ 不强填,交由引擎必填校验如实报错
+ return;
+ }
+ currentUser = currentUser.trim();
+ for (String col : cols) {
+ // 仅当缺失/空白才填,绝不覆盖用户显式传入的值
+ Object existing = body.get(col);
+ if (existing == null || existing.toString().isBlank()) {
+ body.put(col, currentUser);
+ log.debug("[USER-FILL] table={} col={} <- currentUser={}", table, col, currentUser);
+ }
+ }
+ }
+
+ /**
+ * 该表的「必填用户引用列」集合(大写,排除 CREATEBY/UPDATEBY)。结果缓存(含空集合)。
+ * 解析口径与 {@link com.eip4.platform.metadata.flow.UserColumnResolver#queryUserColumns} 一致,
+ * 仅多 {@code ea.ismandatory=1} 收口。
+ */
+ private Set mandatoryUserColumnsForTable(String table) {
+ return mandatoryUserColumnsByTable.get(table.toUpperCase(), this::queryMandatoryUserColumns);
+ }
+
+ private Set queryMandatoryUserColumns(String upperTable) {
+ try {
+ List cols = jdbcTemplate.queryForList(
+ "SELECT UPPER(ea.columnname) AS col "
+ + "FROM eip3.sys_entityattribute ea "
+ + "JOIN eip3.sys_entity e1 ON UPPER(e1.sys_entity_id) = UPPER(ea.entityid) "
+ + "JOIN eip3.sys_reference r ON UPPER(r.sys_reference_id) = UPPER(ea.referenceid) "
+ + "JOIN eip3.sys_entity e2 ON UPPER(e2.sys_entity_id) = UPPER(r.entityid) "
+ + "WHERE UPPER(e1.tablename) = ? "
+ + "AND ea.ismandatory = 1 "
+ + "AND UPPER(e2.tablename) IN ('SYS_USER', 'VIEW_SYS_USER') "
+ + "AND UPPER(ea.columnname) NOT IN ('CREATEBY', 'UPDATEBY')",
+ String.class, upperTable);
+ if (cols.isEmpty()) {
+ return Collections.emptySet();
+ }
+ Set set = new HashSet<>(cols);
+ log.debug("[USER-FILL] table={} mandatoryUserRefCols={}", upperTable, set);
+ return set;
+ } catch (org.springframework.dao.DataAccessException ex) {
+ // 元数据查询异常(库不可用等)→ 视作无可填列,绝不阻断写路径(交引擎校验如实报错)
+ log.warn("[USER-FILL] 解析必填用户引用列失败 table={}: {}", upperTable, ex.getMessage());
+ return Collections.emptySet();
+ }
+ }
+
+ /** 失效全部缓存(与 /api/meta/evict 钩子对齐:元数据/用户改动后重建)。 */
+ public void evictAll() {
+ mandatoryUserColumnsByTable.invalidateAll();
+ }
+
+ /** 失效某表的缓存(表结构/引用关系/必填标志变更时)。 */
+ public void evictTable(String table) {
+ if (table != null && !table.isBlank()) {
+ mandatoryUserColumnsByTable.invalidate(table.toUpperCase());
+ }
+ }
+}
diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/EntityWriteControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/EntityWriteControllerTest.java
index 42d2c2a..94d4bf1 100644
--- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/EntityWriteControllerTest.java
+++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/EntityWriteControllerTest.java
@@ -27,6 +27,7 @@ import com.dsasp.server.common.dataDic.bean.GeneralPOJO;
import com.dsasp.server.common.dataDic.service.POJOCRUDService;
import com.eip4.platform.metadata.security.IdentifierWhitelist;
import com.eip4.platform.metadata.security.IllegalIdentifierException;
+import com.eip4.platform.metadata.write.MandatoryUserColumnFiller;
import com.eip4.platform.metadata.write.WritePrivilegeChecker;
/**
@@ -66,7 +67,8 @@ class EntityWriteControllerTest {
when(engine.save(any(Map.class), eq(TABLE), any(Properties.class))).thenReturn(fakePojo);
when(checker.isAdmin(any())).thenReturn(true); // ADMIN 跳过权限
- EntityWriteController c = new EntityWriteController(engine, wl, checker);
+ EntityWriteController c = new EntityWriteController(engine, wl, checker,
+ mock(MandatoryUserColumnFiller.class));
Map body = new HashMap<>();
body.put("NAME", "E2E-测试角色");
@@ -95,7 +97,8 @@ class EntityWriteControllerTest {
when(checker.isAdmin(any())).thenReturn(false);
doNothing().when(checker).checkCanWrite(eq(TABLE), any(GeneralPOJO.class), any(Properties.class));
- EntityWriteController c = new EntityWriteController(engine, wl, checker);
+ EntityWriteController c = new EntityWriteController(engine, wl, checker,
+ mock(MandatoryUserColumnFiller.class));
Map body = new HashMap<>();
body.put("SYS_ROLE_ID", "existing-id");
body.put("NAME", "E2E-更新角色");
@@ -121,7 +124,8 @@ class EntityWriteControllerTest {
doThrow(new IllegalIdentifierException("非法实体或元数据不存在: EVIL"))
.when(wl).requireLegalTable(eq("EVIL"));
- EntityWriteController c = new EntityWriteController(engine, wl, checker);
+ EntityWriteController c = new EntityWriteController(engine, wl, checker,
+ mock(MandatoryUserColumnFiller.class));
Map body = Map.of("NAME", "test");
org.junit.jupiter.api.Assertions.assertThrows(IllegalIdentifierException.class,
@@ -136,7 +140,8 @@ class EntityWriteControllerTest {
IdentifierWhitelist wl = mock(IdentifierWhitelist.class);
WritePrivilegeChecker checker = mock(WritePrivilegeChecker.class);
- EntityWriteController c = new EntityWriteController(engine, wl, checker);
+ EntityWriteController c = new EntityWriteController(engine, wl, checker,
+ mock(MandatoryUserColumnFiller.class));
ResponseEntity