From 771f1765cc871696b05d713f167ad7d0b7909340 Mon Sep 17 00:00:00 2001 From: lwh <2679599887@qq.com> Date: Fri, 12 May 2023 01:20:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=B5=81=E9=87=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Flow/Flow.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/admin/controller/Flow/Flow.php b/app/admin/controller/Flow/Flow.php index 7edceac..6ad861d 100644 --- a/app/admin/controller/Flow/Flow.php +++ b/app/admin/controller/Flow/Flow.php @@ -56,6 +56,8 @@ class Flow extends BaseController $select = $query->field([ 'flow_id', 'flow_source', + 'flow_target', + 'flow_os', ])->select(); $GDP = $query->field([ @@ -215,12 +217,12 @@ class Flow extends BaseController // ]) // ->order('flow_id', 'desc') // ->select()->toArray(); - $select = $query->whereMonth('flow_create_time', $current_month_date) + $select = $query->whereMonth('flow_create_time', $current_month_date) ->field([ 'flow_create_time', ]) ->buildSql(); - return $select; + return $select; $GDP = []; $res_select = []; for ($i = 1; $i <= date('t', strtotime(date('Y-m-01') . "$current_month month")); $i++) { @@ -303,5 +305,4 @@ class Flow extends BaseController //获取数字对应的星期 return $weekArr[$number_wk]; } - }