diff --git a/app/common/service/VehVehicleSkuService.php b/app/common/service/VehVehicleSkuService.php index 0fa8649..e494122 100644 --- a/app/common/service/VehVehicleSkuService.php +++ b/app/common/service/VehVehicleSkuService.php @@ -91,10 +91,26 @@ class VehVehicleSkuService case 'default': $config['where']['is_active'] = 1; $config['order']['id'] = 'desc'; + + // 关键字筛选 + if (isset($p['keyword']) && $p['keyword']) { + $k = '%' . $p['keyword'] . '%'; + foreach (['model_name','series_name','brand_name',] as $col) { + $config['orWhere'][] = [$col, 'like', $k]; + } + } break; case 'index': $config['where']['is_active'] = 1; $config['order']['id'] = 'desc'; + + // 关键字筛选 + if (isset($p['keyword']) && $p['keyword']) { + $k = '%' . $p['keyword'] . '%'; + foreach (['model_name','series_name','brand_name',] as $col) { + $config['orWhere'][] = [$col, 'like', $k]; + } + } break; case 'show': $config['where']['id'] = $p['id']; diff --git a/app/crm/service/CustomerService.php b/app/crm/service/CustomerService.php index c08b21d..63274db 100644 --- a/app/crm/service/CustomerService.php +++ b/app/crm/service/CustomerService.php @@ -46,6 +46,7 @@ class CustomerService $sort = $params['sort'] ?? null; $sortId = $params['sort_id'] ?? null; $countryId = $params['country_id'] ?? ''; + $channelId = $params['channel_id'] ?? ''; $where = []; $user_id =$params['user_id']; @@ -62,6 +63,9 @@ class CustomerService if (!empty($countryId)){ $where[] = ['country_id', $countryId]; } + if (!empty($channelId)){ + $where[] = ['channel_id', $channelId]; + } $grade = []; if (!Util::isEmpty($follow) && $follow == 0) { diff --git a/app/crmAdmin/service/CustomerService.php b/app/crmAdmin/service/CustomerService.php index 41bf5d7..56d42f1 100644 --- a/app/crmAdmin/service/CustomerService.php +++ b/app/crmAdmin/service/CustomerService.php @@ -53,6 +53,7 @@ class CustomerService $user_id = $params['user_id'] ?? ''; $seas = $params['seas'] ?? ''; //recyclea:管理端回收站,audit:待审核列表,seas:公海 $scene = $params['scene'] ?? ''; + $channelId = $params['channel_id'] ?? ''; $where = []; if ($scene == 'audit') { @@ -69,6 +70,9 @@ class CustomerService // $where[] = ['user_id', $user_id]; // } + if (!empty($channelId)){ + $where[] = ['channel_id', $channelId]; + } $grade = []; if (!Util::isEmpty($follow) && $follow == 0) {