优化

2026-08-11 19:35:18 +08:00
parent 4d49d7a2e4
commit 3809d2a028
4 changed files with 301 additions and 2 deletions
@@ -13760,10 +13760,91 @@ VALUES
  (5205011, 10001, 'MERCHANT', 'BUTTON', 5205000, 'merchant:finance:statement:view', '查看账单详情及收款', NULL, 'GET', 20, 'ACTIVE', 0)
 ON DUPLICATE KEY UPDATE permission_name=VALUES(permission_name), parent_id=VALUES(parent_id), route_path=VALUES(route_path), http_method=VALUES(http_method), status='ACTIVE', deleted=0;

+-- Finance G1/G2 新权限只进入可分配权限目录，不默认授予平台管理员。
+DROP PROCEDURE IF EXISTS migrate_finance_g1_g2_permissions;
+DELIMITER $$
+CREATE PROCEDURE migrate_finance_g1_g2_permissions()
+BEGIN
+  IF EXISTS (
+    SELECT 1
+      FROM baiyue_iam.iam_permission
+     WHERE (id = 5105022 AND permission_code <> 'platform:finance:account:view')
+        OR (id = 5105023 AND permission_code <> 'platform:finance:fee-source:view')
+        OR (id = 5105024 AND permission_code <> 'platform:finance:fee-source:review')
+        OR (id = 5105025 AND permission_code <> 'platform:finance:fee-source:settlement')
+        OR (permission_code = 'platform:finance:account:view' AND id <> 5105022)
+        OR (permission_code = 'platform:finance:fee-source:view' AND id <> 5105023)
+        OR (permission_code = 'platform:finance:fee-source:review' AND id <> 5105024)
+        OR (permission_code = 'platform:finance:fee-source:settlement' AND id <> 5105025)
+        OR (id IN (5105022, 5105023, 5105024, 5105025)
+            AND (tenant_id <> 0 OR app_code <> 'PLATFORM'))
+  ) THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = 'finance G1/G2 permission id/code conflict';
+  END IF;
+
+  INSERT INTO baiyue_iam.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)
+  VALUES
+    (5105022, 0, 'PLATFORM', 'BUTTON', 5105000, 'platform:finance:account:view',
+     '查看客户财务账户及流水', NULL, 'GET', 130, 'ACTIVE', 1, 0),
+    (5105023, 0, 'PLATFORM', 'BUTTON', 5105000, 'platform:finance:fee-source:view',
+     '查看财务费用来源', NULL, 'GET', 140, 'ACTIVE', 1, 0),
+    (5105024, 0, 'PLATFORM', 'BUTTON', 5105000, 'platform:finance:fee-source:review',
+     '审核财务费用来源', NULL, 'POST', 150, 'ACTIVE', 1, 0),
+    (5105025, 0, 'PLATFORM', 'BUTTON', 5105000, 'platform:finance:fee-source:settlement',
+     '设置费用来源参与结算', NULL, 'PUT', 160, 'ACTIVE', 1, 0)
+  ON DUPLICATE KEY UPDATE
+    permission_type = VALUES(permission_type), parent_id = VALUES(parent_id),
+    permission_name = VALUES(permission_name), route_path = VALUES(route_path),
+    http_method = VALUES(http_method), sort_no = VALUES(sort_no),
+    status = 'ACTIVE', built_in = 1, deleted = 0;
+
+  IF (SELECT COUNT(*)
+        FROM baiyue_iam.iam_permission
+       WHERE tenant_id = 0
+         AND app_code = 'PLATFORM'
+         AND permission_type = 'BUTTON'
+         AND parent_id = 5105000
+         AND status = 'ACTIVE'
+         AND built_in = 1
+         AND deleted = 0
+         AND permission_code IN (
+           'platform:finance:account:view',
+           'platform:finance:fee-source:view',
+           'platform:finance:fee-source:review',
+           'platform:finance:fee-source:settlement')) <> 4 THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = 'finance G1/G2 permission catalog is incomplete';
+  END IF;
+END$$
+DELIMITER ;
+CALL migrate_finance_g1_g2_permissions();
+DROP PROCEDURE IF EXISTS migrate_finance_g1_g2_permissions;
+
 INSERT INTO baiyue_iam.iam_role_permission (role_id, permission_id, tenant_id)
 SELECT 4000001, id, 0 FROM baiyue_iam.iam_permission
- WHERE tenant_id=0 AND app_code='PLATFORM' AND (permission_code='platform:finance' OR permission_code LIKE 'platform:finance:%')
+ WHERE tenant_id=0 AND app_code='PLATFORM' AND permission_code IN (
+   'platform:finance',
+   'platform:finance:bill:view', 'platform:finance:bill:create',
+   'platform:finance:bill:update', 'platform:finance:bill:issue',
+   'platform:finance:bill:adjust', 'platform:finance:bill:void',
+   'platform:finance:receipt:view', 'platform:finance:receipt:create',
+   'platform:finance:cost:view', 'platform:finance:cost:create',
+   'platform:finance:customer-terms:view', 'platform:finance:customer-terms:update')
 ON DUPLICATE KEY UPDATE tenant_id=VALUES(tenant_id);
+DELETE rp
+  FROM baiyue_iam.iam_role_permission rp
+  JOIN baiyue_iam.iam_permission p
+    ON p.id = rp.permission_id AND p.tenant_id = rp.tenant_id
+ WHERE rp.role_id = 4000001
+   AND rp.tenant_id = 0
+   AND p.permission_code IN (
+     'platform:finance:account:view',
+     'platform:finance:fee-source:view',
+     'platform:finance:fee-source:review',
+     'platform:finance:fee-source:settlement');
 INSERT INTO baiyue_iam.iam_role_permission (role_id, permission_id, tenant_id)
 SELECT 4000101, id, 10001 FROM baiyue_iam.iam_permission
 WHERE tenant_id=10001 AND app_code='MERCHANT' AND (permission_code='merchant:finance:statement' OR permission_code LIKE 'merchant:finance:%')
@@ -13773,7 +13854,7 @@ ON DUPLICATE KEY UPDATE tenant_id=VALUES(tenant_id);
 DELIMITER $$
 CREATE PROCEDURE assert_finance_permissions()
 BEGIN
-  IF (SELECT COUNT(*) FROM baiyue_iam.iam_permission WHERE tenant_id=0 AND app_code='PLATFORM' AND permission_code LIKE 'platform:finance:%' AND status='ACTIVE' AND deleted=0) <> 12 THEN
+  IF (SELECT COUNT(*) FROM baiyue_iam.iam_permission WHERE tenant_id=0 AND app_code='PLATFORM' AND permission_code LIKE 'platform:finance:%' AND status='ACTIVE' AND deleted=0) <> 16 THEN
    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='统一迁移失败：平台 Finance 权限不完整';
  END IF;
  IF (SELECT COUNT(*) FROM baiyue_iam.iam_permission WHERE tenant_id=10001 AND app_code='MERCHANT' AND permission_code IN ('merchant:finance:statement:list','merchant:finance:statement:view') AND status='ACTIVE' AND deleted=0) <> 2 THEN
@@ -13782,6 +13863,9 @@ BEGIN
  IF (SELECT COUNT(*) FROM baiyue_iam.iam_role_permission rp JOIN baiyue_iam.iam_permission p ON p.id=rp.permission_id AND p.tenant_id=rp.tenant_id WHERE rp.role_id=4000001 AND rp.tenant_id=0 AND (p.permission_code='platform:finance' OR p.permission_code LIKE 'platform:finance:%')) <> 13 THEN
    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='统一迁移失败：平台管理员 Finance 授权不完整';
  END IF;
+  IF (SELECT COUNT(*) FROM baiyue_iam.iam_role_permission rp JOIN baiyue_iam.iam_permission p ON p.id=rp.permission_id AND p.tenant_id=rp.tenant_id WHERE rp.role_id=4000001 AND rp.tenant_id=0 AND p.permission_code IN ('platform:finance:account:view','platform:finance:fee-source:view','platform:finance:fee-source:review','platform:finance:fee-source:settlement')) <> 0 THEN
+    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='统一迁移失败：Finance G1/G2 新权限不得默认授予平台管理员';
+  END IF;
  IF (SELECT COUNT(*) FROM baiyue_iam.iam_role_permission rp JOIN baiyue_iam.iam_permission p ON p.id=rp.permission_id AND p.tenant_id=rp.tenant_id WHERE rp.role_id=4000101 AND rp.tenant_id=10001 AND (p.permission_code='merchant:finance:statement' OR p.permission_code LIKE 'merchant:finance:%')) <> 3 THEN
    SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='统一迁移失败：客户管理员 Finance 只读授权不完整';
  END IF;