diff --git a/application/admin/controller/Auth.php b/application/admin/controller/Auth.php index 9701a0a..9b8e17d 100644 --- a/application/admin/controller/Auth.php +++ b/application/admin/controller/Auth.php @@ -9,6 +9,8 @@ namespace app\admin\controller; use app\model\ApiAuthGroup; +use app\model\ApiAuthRule; +use app\model\ApiMenu; use app\model\ApiUser; use app\util\ReturnCode; @@ -40,6 +42,28 @@ class Auth extends Base { ]); } + public function getRuleList() { + $groupId = $this->request->get('groupId', 0); + + $list = (new ApiMenu)->where([])->order('sort', 'ASC')->select(); + $list = $this->buildArrFromObj($list); + $list = listToTree($list); + + if ($groupId) { + $rules = (new ApiAuthRule())->where(['groupId' => $groupId])->select(); + $rules = array_column($rules, 'url'); + } + + $newList = []; + foreach ($list as $key => $value) { + + } + + return $this->buildSuccess([ + 'list' => $newList + ], '登录成功'); + } + /** * 新增用户 等待组权限 * @return array diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php index bcdb710..5a261ed 100644 --- a/application/admin/controller/Menu.php +++ b/application/admin/controller/Menu.php @@ -21,7 +21,7 @@ class Menu extends Base { */ public function index() { $list = ApiMenu::all(); - $list = json_decode(json_encode($list), true); + $list = $this->buildArrFromObj($list); $list = formatTree(listToTree($list)); return $this->buildSuccess([ diff --git a/application/adminRoute.php b/application/adminRoute.php index dd5a720..ba46308 100644 --- a/application/adminRoute.php +++ b/application/adminRoute.php @@ -71,6 +71,10 @@ return [ 'admin/Auth/del', ['method' => 'get', 'after_behavior' => $afterBehavior] ], + 'Auth/getRuleList' => [ + 'admin/Auth/getRuleList', + ['method' => 'get', 'after_behavior' => $afterBehavior] + ], '__miss__' => ['admin/Miss/index'], ], ];