优化

deploy/sql/头程数据库统一增量-MySQL8.sql

@@ -9227,6 +9227,9 @@ UPDATE iam_permission
    SET permission_code='platform:firstleg:ocean-booking:view',status='INACTIVE',deleted=1
  WHERE id=5102141 AND permission_code='platform:firstleg:ocean-booking:list';
 
+DELETE rp FROM iam_role_permission rp WHERE rp.permission_id IN (5102143,5102144,5102145);
+DELETE FROM iam_permission WHERE id IN (5102143,5102144,5102145);
+
 INSERT INTO iam_permission
   (id,tenant_id,app_code,permission_type,parent_id,permission_code,permission_name,
    route_path,http_method,sort_no,status,built_in,deleted)
@@ -9249,8 +9252,6 @@ WHERE role.tenant_id=0 AND role.role_code IN ('PLATFORM_ADMIN','ORDER_OPERATOR')
 DELETE rp FROM iam_role_permission rp JOIN iam_permission p ON p.tenant_id=rp.tenant_id AND p.id=rp.permission_id
 WHERE p.id=5102141;
 UPDATE iam_permission SET status='INACTIVE',deleted=1 WHERE id=5102141;
-DELETE rp FROM iam_role_permission rp WHERE rp.permission_id IN (5102143,5102144,5102145);
-DELETE FROM iam_permission WHERE id IN (5102143,5102144,5102145);
 
 USE baiyue_firstleg;
 

firstleg/src/main/resources/db/phase3-ocean-booking-schema.sql

@@ -269,6 +269,9 @@ UPDATE iam_permission
    SET permission_code='platform:firstleg:ocean-booking:view',status='INACTIVE',deleted=1
  WHERE id=5102141 AND permission_code='platform:firstleg:ocean-booking:list';
 
+DELETE rp FROM iam_role_permission rp WHERE rp.permission_id IN (5102143,5102144,5102145);
+DELETE FROM iam_permission WHERE id IN (5102143,5102144,5102145);
+
 INSERT INTO iam_permission
   (id,tenant_id,app_code,permission_type,parent_id,permission_code,permission_name,
    route_path,http_method,sort_no,status,built_in,deleted)
@@ -291,7 +294,5 @@ WHERE role.tenant_id=0 AND role.role_code IN ('PLATFORM_ADMIN','ORDER_OPERATOR')
 DELETE rp FROM iam_role_permission rp JOIN iam_permission p ON p.tenant_id=rp.tenant_id AND p.id=rp.permission_id
 WHERE p.id=5102141;
 UPDATE iam_permission SET status='INACTIVE',deleted=1 WHERE id=5102141;
-DELETE rp FROM iam_role_permission rp WHERE rp.permission_id IN (5102143,5102144,5102145);
-DELETE FROM iam_permission WHERE id IN (5102143,5102144,5102145);
 
 USE baiyue_firstleg;

scripts/admin-test-env-modules/initialization-baseline-contract.test.mjs

@@ -42,6 +42,11 @@ test('三期权限迁移允许脚本历史版本写入的旧权限并在随后
     assert.match(source, /SET permission_code='platform:firstleg:ocean-booking:view',status='INACTIVE',deleted=1/)
     assert.match(source, /UPDATE iam_permission SET status='INACTIVE',deleted=1 WHERE id=5102141/)
     assert.match(source, /DELETE FROM iam_permission WHERE id IN \(5102143,5102144,5102145\)/)
+    assert.ok(
+      source.indexOf('DELETE FROM iam_permission WHERE id IN (5102143,5102144,5102145)') <
+        source.indexOf('(5102147,0,\'PLATFORM\',\'BUTTON\',5102140,\'platform:firstleg:ocean-booking:edit\''),
+      'legacy ocean-booking edit permission must be removed before assigning the code to 5102147',
+    )
   }
 
   for (const source of [sql, truckAppointmentSchema]) {

scripts/local-db-full-acceptance.ps1

@@ -11,8 +11,8 @@ $ErrorActionPreference = 'Stop'
 $Repo = (Resolve-Path (Join-Path $PSScriptRoot '..')).Path
 $Workspace = (Resolve-Path (Join-Path $Repo '..')).Path
 $Acceptance = Join-Path $Workspace '.codex-tmp\p23-04-acceptance'
-$ExpectedSha256 = '8A269D219F8824352818BB427033F46F79CFB4652F36F0A9DA01A5913ABB50C6'
+$ExpectedSha256 = '0EE13427AB60CECCEB42985CF1E78A05645C18CD9BF2886110C0AFEAF3CA7B9B'
-$ExpectedLines = 15673
+$ExpectedLines = 15674
 
 if ($TargetHost -notin @('127.0.0.1', 'localhost')) {
     [Console]::Error.WriteLine('Refusing non-local database; only 127.0.0.1 or localhost is allowed.')