From 6a9dc3471310cdd25dfa9eed478be50e52a6077e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sat, 31 Oct 2026 22:45:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(db):=20V185=20=E8=8F=9C=E5=8D=95=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E6=98=BE=E5=BC=8F=E5=86=99=20company=5Fid=20=E5=B9=B6?= =?UTF-8?q?=E6=8C=89=E5=85=AC=E5=8F=B8=E5=B9=82=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit columns.company_id 是 NOT NULL 无默认值,漏写直接 1364,导致 V185 从未应用成功 (库里留 success=0 历史行,A/B 后端都起不来)。菜单是每公司一行,幂等判据改成 (company_id, column_key);事务内实测插入 6 行后回滚干净。 --- .../resources/db/V185__task_evidence_menu.sql | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/backend-java/src/main/resources/db/V185__task_evidence_menu.sql b/backend-java/src/main/resources/db/V185__task_evidence_menu.sql index abaac86e8..f38517193 100644 --- a/backend-java/src/main/resources/db/V185__task_evidence_menu.sql +++ b/backend-java/src/main/resources/db/V185__task_evidence_menu.sql @@ -1,15 +1,23 @@ -- 迁移 V185:后台菜单「任务证据」(v1.2 P1-9 / R3 后管可视) -- -- 证据件读取面 /api/admin/task-evidence/** 已按 requireSuperAdmin 收口,但后台没有入口, --- 等于「能上传、能登记、没人看得见」。这里只新增一条菜单行,挂在「记录与版本」分组下, --- 幂等插入:column_key 已存在时不再写第二行。 +-- 等于「能上传、能登记、没人看得见」。这里只新增一条菜单行,挂在「记录与版本」分组下。 +-- +-- 2026-10-31 修正(该版本此前**从未成功应用**,库里有 success=0 的历史行): +-- 1) 必须显式写 company_id:columns.company_id 是 NOT NULL 且**没有默认值**, +-- 漏写会直接报 `Field 'company_id' doesn't have a default value`(1364); +-- 2) 菜单是**每公司一行**:每个 company 都有自己的 admin_group_record 分组, +-- 只插一行会让其余公司看不到入口。幂等判据也必须按 (company_id, column_key) 判。 -- -- 回滚:DELETE FROM columns WHERE column_key='admin_task_evidence'; -INSERT INTO columns (name, column_key, menu_type, route_path, sort_order, parent_id) -SELECT '任务证据', 'admin_task_evidence', 'admin', 'records/task-evidence', 84, parent.id +INSERT INTO columns (name, column_key, menu_type, route_path, sort_order, parent_id, company_id) +SELECT '任务证据', 'admin_task_evidence', 'admin', 'records/task-evidence', 84, + parent.id, parent.company_id FROM columns parent WHERE parent.column_key = 'admin_group_record' AND NOT EXISTS ( - SELECT 1 FROM columns WHERE column_key = 'admin_task_evidence' + SELECT 1 FROM columns child + WHERE child.column_key = 'admin_task_evidence' + AND child.company_id = parent.company_id );