update:更新权限系统

2021-03-31 20:20:21 +08:00
parent d4020b93a3
commit 2b96f3b650
15 changed files with 582 additions and 7 deletions
--- a/catch/permissions/model/Roles.php
+++ b/catch/permissions/model/Roles.php
@@ -35,8 +35,18 @@ class Roles extends CatchModel
    public function getList()
    {
        return $this->catchSearch()
+                    ->with(['permissions', 'departments'])
                    ->order('id', 'desc')
                    ->select()
+                    ->each(function (&$item){
+                        $permissions = $item->permissions->column('id');
+                        unset($item['permissions']);
+                        $item['permissions'] = $permissions;
+
+                        $departments = $item->departments->column('id');
+                        unset($item['departments']);
+                        $item['departments'] = $departments;
+                    })
                    ->toTree();
    }