fnvtk/cunkebao_v3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码同步

Browse Source
This commit is contained in:
Ghost
2025-03-24 14:59:19 +08:00
parent f0fa19f89f
commit bd2e1e5386
716 changed files with 90318 additions and 26155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Server/application/api/controller/DeviceController.php
View File

@@ -14,10 +14,10 @@ class DeviceController extends BaseController
* 获取设备列表
* @return \think\response\Json
*/
public function getlist()
public function getlist($pageIndex = '',$pageSize = '',$authorization = '')
{
// 获取授权token
$authorization = trim($this->request->header('authorization', ''));
$authorization = !empty($authorization) ? $authorization : trim($this->request->header('authorization', ''));
if (empty($authorization)) {
return errorJson('缺少授权信息');
}
@@ -42,8 +42,8 @@ class DeviceController extends BaseController
'alive' => $this->request->param('alive', ''),
'hasWechat' => $this->request->param('hasWechat', ''),
'departmentId' => $this->request->param('departmentId', ''),
'pageIndex' => $this->request->param('pageIndex', 0),
'pageSize' => $this->request->param('pageSize', 20)
'pageIndex' => !empty($pageIndex) ? $pageIndex : $this->request->param('pageIndex', 0),
'pageSize' => !empty($pageSize) ? $pageSize : $this->request->param('pageSize', 20)
];
// 设置请求头