|
|
@@ -99,10 +99,21 @@ class AdminController extends BaseController
|
|
|
// Log::adminHandle('编辑管理员:'.$result->ADMIN_NAME);
|
|
|
});
|
|
|
}
|
|
|
- $oneData = Admin::findOneAsArray(['ID'=>$id]);
|
|
|
- // 获取全部管理员角色
|
|
|
- $adminRoles = Cache::getAdminRole();
|
|
|
- return static::notice(['oneData'=>['adminName'=>$oneData['ADMIN_NAME'],'realName'=>$oneData['REAL_NAME'],'remark'=>$oneData['REMARK'],'isEnable'=>$oneData['IS_ENABLE']?true:false,'isModifyPassword'=>$oneData['IS_MODIFY_PASSWORD']?true:false,'bindIp'=>$oneData['BIND_IP'],'roleId'=>$oneData['ROLE_ID']], 'adminRoles'=>$adminRoles]);
|
|
|
+ $oneData = Admin::findOneAsArray(['ID' => $id]);
|
|
|
+ $result = [
|
|
|
+ 'oneData' => [
|
|
|
+ 'adminName' => $oneData['ADMIN_NAME'],
|
|
|
+ 'realName' => $oneData['REAL_NAME'],
|
|
|
+ 'remark' => $oneData['REMARK'],
|
|
|
+ 'isEnable' => (bool)$oneData['IS_ENABLE'],
|
|
|
+ 'isModifyPassword' => (bool)$oneData['IS_MODIFY_PASSWORD'],
|
|
|
+ 'bindIp' => $oneData['BIND_IP'],
|
|
|
+ 'roleId' => $oneData['ROLE_ID'],
|
|
|
+ 'email' => $oneData['EMAIL'],
|
|
|
+ ],
|
|
|
+ 'adminRoles' => Cache::getAdminRole(),
|
|
|
+ ];
|
|
|
+ return static::notice($result);
|
|
|
}
|
|
|
|
|
|
/**
|