袁聪merge：合并分支

2026-09-11 17:26:18 +08:00
parent a94d5c754d 0a78a9df76
commit 61861cdef6
95 changed files with 18208 additions and 120 deletions
@@ -298,18 +298,15 @@ class AdminService:
            elif action == "reviews":
                if values["decision"] == "rejected":
                    # 允许创建人自审（不再要求 reviewer 与 created_by 不同）；仍然强制审核节点。
-                    # 自审时 reviewer_id 留空：库约束 chk_config_release_separation 是基线的一部分，
-                    # 自审人身份由 interaction_audit 的 reviews 审计（actor_id）承担。
+                    # 自审同样如实写入 reviewer_id：该列含义就是"审核人"，迁移
+                    # 20260910_drop_review_separation / 20260911_drop_review_separation
+                    # 已撤下"审核人≠创建人"的检查约束（两条并行分支各补一次，均为幂等实现）。
                    if row["status"] != "pending_review":
                        raise InvalidStateError("只能驳回待审核版本")
                    return await repo.update(
                        "config_release",
                        row["id"],
-                        {
-                            "status": "rejected",
-                            "reviewer_id": None if row["created_by"] == actor else actor,
-                            "reviewed_at": now,
-                        },
+                        {"status": "rejected", "reviewer_id": actor, "reviewed_at": now},
                    )
                result = await service.approve(row["id"], actor)
            elif action == "activations":