|
@@ -83,7 +83,7 @@ class RoleService extends BaseService
|
|
|
$roleMenuModel = new RoleMenuModel();
|
|
$roleMenuModel = new RoleMenuModel();
|
|
|
$roleMenuList = $roleMenuModel->where("role_id", $roleId)->get("menu_id")->toArray();
|
|
$roleMenuList = $roleMenuModel->where("role_id", $roleId)->get("menu_id")->toArray();
|
|
|
$menuIdList = array_key_value($roleMenuList, "menu_id");
|
|
$menuIdList = array_key_value($roleMenuList, "menu_id");
|
|
|
- $check = $roleId<=0 && UserRoleModel::where(['user_id'=>$userId,'role_id'=>1])->value('role_id');
|
|
|
|
|
|
|
+ $check = $roleId<=0? UserRoleModel::where(['user_id'=>$userId,'role_id'=>1])->value('role_id'):false;
|
|
|
foreach ($menuList as &$val) {
|
|
foreach ($menuList as &$val) {
|
|
|
if (in_array($val['id'], $menuIdList) || $check) {
|
|
if (in_array($val['id'], $menuIdList) || $check) {
|
|
|
$val['checked'] = true;
|
|
$val['checked'] = true;
|