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

gx



查看合并请求 !2567

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

@@ -34,7 +34,7 @@ class Base extends Model
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
-    public function lists($map, $page, $row, $order = 'id', $fields = ['*'], $sort = 'desc'): array
+    public function getManagerListlists($map, $page, $row, $order = 'id', $fields = ['*'], $sort = 'desc'): array
     {
     {
         $query = $this->formatQuery($map);
         $query = $this->formatQuery($map);
         $query = $this->sortOrder($query,$order,$sort);
         $query = $this->sortOrder($query,$order,$sort);