|
|
@@ -1350,6 +1350,7 @@ class BasicPanel extends Controller
|
|
|
$company_id = request('access_token.company_id', '0');
|
|
|
$is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
|
|
|
//终端类型B端、C端、OTO
|
|
|
+ $province_id = request('province_id', ''); //省份id
|
|
|
$terminal_type = request('terminal_type', '');
|
|
|
$yesterdayStart = Carbon::yesterday()->startOfDay()->getTimestamp(); // 昨天开始时间 00:00:00
|
|
|
$yesterdayEnd = Carbon::yesterday()->endOfDay()->getTimestamp(); // 昨天结束时间 23:59:59
|
|
|
@@ -1363,6 +1364,7 @@ class BasicPanel extends Controller
|
|
|
$map = [];
|
|
|
if ($start_time) $map[] = ['insert_time', '>=', $start_time];
|
|
|
if ($end_time) $map[] = ['insert_time', '<=', $end_time];
|
|
|
+ if ($province_id) $map[] = ['province_id', '=', $province_id];
|
|
|
// 权限判断
|
|
|
if ($is_admin != 1 && $company_id != 0) {
|
|
|
$map[] = ['company_id', '=', $company_id];
|