From c5f26912bd17ef1eff3975a5a8d9af997cdbcee9 Mon Sep 17 00:00:00 2001 From: zlwu <704541015@qq.com> Date: Fri, 20 Nov 2026 14:24:39 +0800 Subject: [PATCH] =?UTF-8?q?fix(sql):=20=E8=A7=A3=E9=99=A4=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E4=B8=AD=E8=AF=95=E6=9C=8D=E5=8A=A1=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=B8=8E=E8=A7=92=E8=89=B2=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 软删市场→中试服务目录及其全部子菜单/按钮在 sys_role_menu 上的有效授权,菜单本身保留,避免误伤其他业务线下的同名菜单。 Co-authored-by: Cursor --- ...oke_market_pilot_service_role_menus_sql.py | 62 +++++ ...revoke-market-pilot-service-role-menus.sql | 256 ++++++++++++++++++ 2 files changed, 318 insertions(+) create mode 100644 backend/tests/test_revoke_market_pilot_service_role_menus_sql.py create mode 100644 docs/sql/migrations/2026-11-20-revoke-market-pilot-service-role-menus.sql diff --git a/backend/tests/test_revoke_market_pilot_service_role_menus_sql.py b/backend/tests/test_revoke_market_pilot_service_role_menus_sql.py new file mode 100644 index 00000000..00edcb2b --- /dev/null +++ b/backend/tests/test_revoke_market_pilot_service_role_menus_sql.py @@ -0,0 +1,62 @@ +"""Static checks for market/pilot-service role-menu revoke migration (#156).""" +import re +from pathlib import Path + + +MIGRATION = ( + Path(__file__).resolve().parents[2] + / "docs/sql/migrations/2026-11-20-revoke-market-pilot-service-role-menus.sql" +) + + +def _sql() -> str: + return MIGRATION.read_text(encoding="utf-8") + + +def _compact(sql: str) -> str: + return re.sub(r"\s+", " ", sql) + + +def _without_comments(sql: str) -> str: + return re.sub(r"--[^\n]*", "", sql) + + +def test_migration_file_exists(): + assert MIGRATION.is_file() + + +def test_scopes_to_market_pilot_service_tree(): + compact = _compact(_without_comments(_sql())) + assert "menu:market" in compact + assert "中试服务" in compact + assert re.search(r"pilot\.menu_name\s*=\s*'中试服务'", compact) + assert re.search(r"market\.perms\s*=\s*'menu:market'", compact) + + +def test_revokes_role_menu_by_soft_delete_only(): + compact = _compact(_without_comments(_sql())) + assert re.search(r"UPDATE\s+sys_role_menu", compact, re.IGNORECASE) + assert re.search( + r"UPDATE\s+sys_role_menu\s+rm\b.*SET\s+rm\.del_flag\s*=\s*1", + compact, + re.IGNORECASE, + ) + assert not re.search(r"DELETE\s+FROM\s+sys_role_menu", compact, re.IGNORECASE) + assert not re.search(r"UPDATE\s+sys_menu\s+SET\s+del_flag\s*=\s*1", compact, re.IGNORECASE) + assert not re.search(r"DELETE\s+FROM\s+sys_menu", compact, re.IGNORECASE) + + +def test_includes_children_and_button_descendants(): + compact = _compact(_without_comments(_sql())) + assert re.search(r"child\.parent_id\s*=\s*pilot\.id", compact) + assert re.search(r"btn\.parent_id\s*=\s*child\.id", compact) + assert compact.count("UNION") >= 2 + + +def test_update_only_touches_active_bindings(): + compact = _compact(_without_comments(_sql())) + assert re.search( + r"SET\s+rm\.del_flag\s*=\s*1[\s\S]*WHERE\s+rm\.del_flag\s*=\s*0", + compact, + re.IGNORECASE, + ) diff --git a/docs/sql/migrations/2026-11-20-revoke-market-pilot-service-role-menus.sql b/docs/sql/migrations/2026-11-20-revoke-market-pilot-service-role-menus.sql new file mode 100644 index 00000000..70c3a030 --- /dev/null +++ b/docs/sql/migrations/2026-11-20-revoke-market-pilot-service-role-menus.sql @@ -0,0 +1,256 @@ +-- 解除【市场】下【中试服务】目录及其全部子菜单(含按钮)与角色的绑定。 +-- Issue #156 +-- 仅软删 sys_role_menu(del_flag=1),不删除/隐藏菜单本身。 +-- 按树定位:menu:market → menu_name=中试服务 → 直系子菜单 → 孙级按钮; +-- 不匹配基础实验/临床应用等其他目录下的同名「出库放行审核」。 +-- MySQL 5.7,可重复执行(只处理 del_flag=0 的绑定)。 + +-- --------------------------------------------------------------------------- +-- 0) 预览:将要解绑的目标菜单(目录 + 子菜单 + 按钮) +-- --------------------------------------------------------------------------- +SELECT + m.tenant_no, + m.id AS menu_id, + m.menu_name, + m.menu_type, + m.perms, + m.parent_id, + m.path +FROM sys_menu m +JOIN ( + SELECT pilot.id AS menu_id, pilot.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' + UNION + SELECT child.id, child.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + JOIN sys_menu child + ON child.parent_id = pilot.id + AND child.tenant_no = market.tenant_no + AND child.del_flag = 0 + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' + UNION + SELECT btn.id, btn.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + JOIN sys_menu child + ON child.parent_id = pilot.id + AND child.tenant_no = market.tenant_no + AND child.del_flag = 0 + JOIN sys_menu btn + ON btn.parent_id = child.id + AND btn.tenant_no = market.tenant_no + AND btn.del_flag = 0 + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' +) tgt + ON tgt.menu_id = m.id + AND tgt.tenant_no = m.tenant_no +WHERE m.del_flag = 0 +ORDER BY m.tenant_no, m.menu_type, m.order_num, m.menu_name; + +-- --------------------------------------------------------------------------- +-- 1) 预览:将要软删的角色-菜单绑定 +-- --------------------------------------------------------------------------- +SELECT + rm.tenant_no, + r.id AS role_id, + r.role_name, + m.id AS menu_id, + m.menu_name, + m.menu_type, + m.perms, + rm.id AS role_menu_id +FROM sys_role_menu rm +JOIN sys_role r + ON r.id = rm.role_id + AND r.tenant_no = rm.tenant_no + AND r.del_flag = 0 +JOIN sys_menu m + ON m.id = rm.menu_id + AND m.tenant_no = rm.tenant_no + AND m.del_flag = 0 +JOIN ( + SELECT pilot.id AS menu_id, pilot.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' + UNION + SELECT child.id, child.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + JOIN sys_menu child + ON child.parent_id = pilot.id + AND child.tenant_no = market.tenant_no + AND child.del_flag = 0 + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' + UNION + SELECT btn.id, btn.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + JOIN sys_menu child + ON child.parent_id = pilot.id + AND child.tenant_no = market.tenant_no + AND child.del_flag = 0 + JOIN sys_menu btn + ON btn.parent_id = child.id + AND btn.tenant_no = market.tenant_no + AND btn.del_flag = 0 + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' +) tgt + ON tgt.menu_id = rm.menu_id + AND tgt.tenant_no = rm.tenant_no +WHERE rm.del_flag = 0 +ORDER BY rm.tenant_no, r.role_name, m.menu_name; + +-- --------------------------------------------------------------------------- +-- 2) 软删绑定(可重复执行) +-- --------------------------------------------------------------------------- +UPDATE sys_role_menu rm +JOIN ( + SELECT pilot.id AS menu_id, pilot.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' + UNION + SELECT child.id, child.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + JOIN sys_menu child + ON child.parent_id = pilot.id + AND child.tenant_no = market.tenant_no + AND child.del_flag = 0 + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' + UNION + SELECT btn.id, btn.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + JOIN sys_menu child + ON child.parent_id = pilot.id + AND child.tenant_no = market.tenant_no + AND child.del_flag = 0 + JOIN sys_menu btn + ON btn.parent_id = child.id + AND btn.tenant_no = market.tenant_no + AND btn.del_flag = 0 + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' +) tgt + ON tgt.menu_id = rm.menu_id + AND tgt.tenant_no = rm.tenant_no +SET + rm.del_flag = 1, + rm.update_by = 'migration', + rm.update_time = NOW() +WHERE rm.del_flag = 0; + +-- --------------------------------------------------------------------------- +-- 3) 核对:目标菜单上不应再有有效角色绑定(期望 0 行) +-- --------------------------------------------------------------------------- +SELECT + rm.tenant_no, + r.role_name, + m.menu_name, + m.perms, + COUNT(*) AS active_role_menu_rows +FROM sys_role_menu rm +JOIN sys_role r + ON r.id = rm.role_id + AND r.tenant_no = rm.tenant_no + AND r.del_flag = 0 +JOIN sys_menu m + ON m.id = rm.menu_id + AND m.tenant_no = rm.tenant_no + AND m.del_flag = 0 +JOIN ( + SELECT pilot.id AS menu_id, pilot.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' + UNION + SELECT child.id, child.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + JOIN sys_menu child + ON child.parent_id = pilot.id + AND child.tenant_no = market.tenant_no + AND child.del_flag = 0 + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' + UNION + SELECT btn.id, btn.tenant_no + FROM sys_menu market + JOIN sys_menu pilot + ON pilot.parent_id = market.id + AND pilot.tenant_no = market.tenant_no + AND pilot.del_flag = 0 + AND pilot.menu_name = '中试服务' + JOIN sys_menu child + ON child.parent_id = pilot.id + AND child.tenant_no = market.tenant_no + AND child.del_flag = 0 + JOIN sys_menu btn + ON btn.parent_id = child.id + AND btn.tenant_no = market.tenant_no + AND btn.del_flag = 0 + WHERE market.del_flag = 0 + AND market.perms = 'menu:market' +) tgt + ON tgt.menu_id = rm.menu_id + AND tgt.tenant_no = rm.tenant_no +WHERE rm.del_flag = 0 +GROUP BY rm.tenant_no, r.role_name, m.menu_name, m.perms; -- 2.54.0