[智价云] 店铺多选合并城市查询

app/Http/Controllers/Manager/Process/ViolationStore.php

@@ -57,6 +57,8 @@ class ViolationStore extends Controller
         $city_ids = request('city_ids', '');
         $collection_time_start_time = request('collection_time_start_time', '');
         $collection_time_end_time = request('collection_time_end_time', '');
+        $merge_city_ids = request('merge_city_ids', '');
+        $merge_province_ids = request('merge_province_ids', '');
         // 时间条件
         if ($collection_time_start_time) $map[] = ['collection_time', '>=', strtotime($collection_time_start_time)];
         if ($collection_time_end_time) $map[] = ['collection_time', '<=', strtotime($collection_time_end_time)];
@@ -144,6 +146,16 @@ class ViolationStore extends Controller
             $city_ids = explode(',', $city_ids);
             $ViolationStoreModel = $ViolationStoreModel->whereIn('city_id', $city_ids);
         }
+        //多选合并省份
+        if ($merge_province_ids && is_string($merge_province_ids)) {
+            $merge_province_ids = explode(',', $merge_province_ids);
+            $ViolationStoreModel = $ViolationStoreModel->whereIn('merge_province_ids', $merge_province_ids);
+        }
+        //多选合并城市
+        if ($merge_city_ids && is_string($merge_city_ids)) {
+            $merge_city_ids = explode(',', $merge_city_ids);
+            $ViolationStoreModel = $ViolationStoreModel->whereIn('merge_city_ids', $merge_city_ids);
+        }
         $personnel_roles_info = $EmployeeModel->leftjoin('personnel_roles', 'personnel_roles.id', '=', 'personnel_employee.role_id')
             ->where('personnel_employee.id', $user_id)->select(['personnel_employee.id', 'personnel_roles.identity'])
             ->first();
@@ -739,7 +751,6 @@ class ViolationStore extends Controller
             $company_id = $admin_company_id;
         }
         $message_data = ['page' => '1', 'limit' => 50, 'admin_id' => $admin_id, 'is_admin' => $is_admin, 'company_id' => $company_id];
-        ViolationStoreJobs::dispatch($message_data);
         // ViolationStoreJobs::dispatchSync($message_data);
         ViolationCompanyJobs::dispatch($message_data);
         // ViolationCompanyJobs::dispatchSync($message_data);