更新

server/app/adminapi/logic/auth/AuthLogic.php

@@ -18,6 +18,7 @@ use app\common\model\auth\Admin;
 use app\common\model\auth\AdminRole;
 use app\common\model\auth\SystemMenu;
 use app\common\model\auth\SystemRoleMenu;
+use app\common\service\qywx\QywxPromotionOperatorAccess;
 
 
 /**
@@ -74,11 +75,9 @@ class AuthLogic
             ->column('perms');
 
         $hasAllAuth = array_diff($allAuth, $roleAuth);
-        if (empty($hasAllAuth)) {
-            return ['*'];
-        }
+        $permissions = empty($hasAllAuth) ? ['*'] : $roleAuth;
 
-        return $roleAuth;
+        return self::appendSharedPromotionPermission($permissions, (int) ($admin['id'] ?? 0));
     }
 
 
@@ -94,12 +93,28 @@ class AuthLogic
         $roleIds = AdminRole::where('admin_id', $adminId)->column('role_id');
         $menuId = SystemRoleMenu::whereIn('role_id', $roleIds)->column('menu_id');
 
-        return SystemMenu::distinct(true)
+        $permissions = SystemMenu::distinct(true)
             ->where([
                 ['is_disable', '=', 0],
                 ['perms', '<>', ''],
                 ['id', 'in', array_unique($menuId)],
             ])
             ->column('perms');
+
+        return self::appendSharedPromotionPermission($permissions, $adminId);
     }
-}
+
+
+    private static function appendSharedPromotionPermission(array $permissions, int $adminId): array
+    {
+        if (in_array('*', $permissions, true)
+            || in_array(QywxPromotionOperatorAccess::PAGE_PERMISSION, $permissions, true)
+            || !QywxPromotionOperatorAccess::hasSharedPagePermission($adminId)) {
+            return $permissions;
+        }
+
+        $permissions[] = QywxPromotionOperatorAccess::PAGE_PERMISSION;
+
+        return array_values(array_unique($permissions));
+    }
+}

server/app/adminapi/logic/auth/MenuLogic.php

@@ -20,6 +20,7 @@ use app\common\logic\BaseLogic;
 use app\common\model\auth\Admin;
 use app\common\model\auth\SystemMenu;
 use app\common\model\auth\SystemRoleMenu;
+use app\common\service\qywx\QywxPromotionOperatorAccess;
 
 
 /**
@@ -51,6 +52,12 @@ class MenuLogic extends BaseLogic
 
         if ($admin['root'] != 1) {
             $roleMenu = SystemRoleMenu::whereIn('role_id', $admin['role_id'])->column('menu_id');
+            if (QywxPromotionOperatorAccess::hasSharedPagePermission((int) $adminId)) {
+                $roleMenu = array_values(array_unique(array_merge(
+                    array_map('intval', $roleMenu),
+                    self::sharedPromotionMenuIds()
+                )));
+            }
             $where[] = ['id', 'in', $roleMenu];
         }
 
@@ -62,6 +69,45 @@ class MenuLogic extends BaseLogic
     }
 
 
+    /** @return list<int> */
+    private static function sharedPromotionMenuIds(): array
+    {
+        $menus = SystemMenu::where('is_disable', 0)
+            ->field('id,pid,perms')
+            ->select()
+            ->toArray();
+        $byId = [];
+        $pageIds = [];
+        foreach ($menus as $menu) {
+            $id = (int) ($menu['id'] ?? 0);
+            if ($id <= 0) {
+                continue;
+            }
+            $byId[$id] = $menu;
+            if ((string) ($menu['perms'] ?? '') === QywxPromotionOperatorAccess::PAGE_PERMISSION) {
+                $pageIds[] = $id;
+            }
+        }
+
+        $result = [];
+        foreach ($pageIds as $pageId) {
+            $chain = [];
+            $currentId = $pageId;
+            while ($currentId > 0) {
+                if (!isset($byId[$currentId])) {
+                    $chain = [];
+                    break;
+                }
+                $chain[] = $currentId;
+                $currentId = (int) ($byId[$currentId]['pid'] ?? 0);
+            }
+            $result = array_merge($result, $chain);
+        }
+
+        return array_values(array_unique($result));
+    }
+
+
     /**
      * @notes 添加菜单
      * @param array $params
@@ -181,4 +227,4 @@ class MenuLogic extends BaseLogic
         return linear_to_tree($data, 'children');
     }
 
-}
+}