diff --git a/source/application/api/controller/pass/Passcc.php b/source/application/api/controller/pass/Passcc.php index a4135c3..e0e2f39 100644 --- a/source/application/api/controller/pass/Passcc.php +++ b/source/application/api/controller/pass/Passcc.php @@ -27,7 +27,9 @@ class Passcc extends Controller { $granularity = $this->request->param('granularity'); $groupsId = $this->request->param('groupsId'); - $data = PassFlow::allGroupTimeNum(['granularity' => $granularity, 'groupsId' => $groupsId]); + $res = PassFlow::allGroupTimeNum(['granularity' => $granularity, 'groupsId' => $groupsId]); + if (empty($res['code'])) $this->renderError($res['msg']); + $data = $res['data']; return $this->renderSuccess(compact('data')); } diff --git a/web/ws_task.php b/web/ws_task.php index 2baf472..0eb2857 100644 --- a/web/ws_task.php +++ b/web/ws_task.php @@ -30,7 +30,7 @@ $ws_worker->onMessage = function(TcpConnection $connection, $data) use($dm) { case 'allGroupTimeNum': $passData = PassFlow::allGroupTimeNum(['granularity' => $request['granularity'] ,'groupsId' => $request['groupsId']],$dm); if (empty($passData['code'])) throw new Exception($passData['msg']); - $returnData['data'] = $passData; + $returnData['data'] = $passData['data']; break; case 'allGroupNum': $passData = PassFlow::allGroupNum($dm);