[智价云] 合并省份查询更新

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

@@ -149,12 +149,12 @@ class ViolationStore extends Controller
         //多选合并省份
         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);
+            $ViolationStoreModel = $ViolationStoreModel->whereIn('merge_province_id', $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);
+            $ViolationStoreModel = $ViolationStoreModel->whereIn('merge_city_id', $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'])