合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2559

@@ -63,7 +63,7 @@ class TicketLogic extends BaseLogic
         $manageModel  = new TicketDailyManageCount();
         $manageModel  = new TicketDailyManageCount();
         $manageList = $manageModel->list(['date'=>$date],'average_time',['*'],'asc',5);//取最近5条数据
         $manageList = $manageModel->list(['date'=>$date],'average_time',['*'],'asc',5);//取最近5条数据
         $deptModel = new TicketDailyDeptCount();
         $deptModel = new TicketDailyDeptCount();
-        $deptList = $deptModel->list(['date'=>$date],'average_time',['*'],'asc',5);
+        $deptList = $deptModel->list([],'date',['*'],'desc',5);
         $data = ['daily'=>$dailyList,'manage'=>$manageList,'dept'=>$deptList];
         $data = ['daily'=>$dailyList,'manage'=>$manageList,'dept'=>$deptList];
         return $this->success($data);
         return $this->success($data);
     }
     }