修改用户信息

This commit is contained in:
wuyanwen 2020-01-07 19:00:04 +08:00
parent b41121e35b
commit cf4ef949b5
4 changed files with 42 additions and 38 deletions

View File

@ -4,6 +4,7 @@ namespace catchAdmin\index\controller;
use catchAdmin\permissions\model\Permissions; use catchAdmin\permissions\model\Permissions;
use catchAdmin\user\Auth; use catchAdmin\user\Auth;
use catcher\base\CatchController; use catcher\base\CatchController;
use catcher\CatchAuth;
use catcher\Tree; use catcher\Tree;
use think\facade\Db; use think\facade\Db;
@ -19,7 +20,9 @@ class Index extends CatchController
*/ */
public function index(): string public function index(): string
{ {
$permissionIds = Auth::user()->getPermissionsBy(); $user = (new CatchAuth())->user();
$permissionIds = $user->getPermissionsBy();
$menus = Permissions::whereIn('id', $permissionIds) $menus = Permissions::whereIn('id', $permissionIds)
->where('type', Permissions::MENU_TYPE) ->where('type', Permissions::MENU_TYPE)
@ -28,7 +31,7 @@ class Index extends CatchController
return $this->fetch([ return $this->fetch([
'menus' => Tree::done($menus), 'menus' => Tree::done($menus),
'username' => Auth::user()->username, 'username' => $user->username,
]); ]);
} }

View File

@ -47,6 +47,7 @@ class User extends CatchController
*/ */
public function info(CatchAuth $auth) public function info(CatchAuth $auth)
{ {
$user = $auth->user(); $user = $auth->user();
$roles = $user->getRoles(); $roles = $user->getRoles();