更新

2026-05-05 13:28:45 +08:00
parent 81b2808eaf
commit d6e105f912
19 changed files with 3730 additions and 267 deletions
@@ -86,13 +86,17 @@ class RoleLogic extends BaseLogic
        try {
            $menuId = !empty($params['menu_id']) ? $params['menu_id'] : [];

-            SystemRole::update([
+            $roleRow = [
                'id' => $params['id'],
                'name' => $params['name'],
                'desc' => $params['desc'] ?? '',
                'sort' => $params['sort'] ?? 0,
-                'data_scope' => self::normalizeDataScope($params['data_scope'] ?? null),
-            ]);
+            ];
+            // 分配权限等非编辑页提交的 edit 若不传 data_scope，不得把库里的范围覆盖成默认全部
+            if (array_key_exists('data_scope', $params)) {
+                $roleRow['data_scope'] = self::normalizeDataScope($params['data_scope'] ?? null);
+            }
+            SystemRole::update($roleRow);

            if (!empty($menuId)) {
                SystemRoleMenu::where(['role_id' => $params['id']])->delete();