|
|
@@ -286,7 +286,7 @@ class LowPriceProductJobs implements ShouldQueue
|
|
|
$where_query1[] = ['duty_type', '=', 1]; //责任类型1=第一责任人,2=责任人
|
|
|
}
|
|
|
//查询地区配置的第一责任人
|
|
|
- $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['city_id'])->pluck('employee_id')->toarray();
|
|
|
+ $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['merge_city_id'])->pluck('employee_id')->toarray();
|
|
|
if (!empty($employee_id_area)) {
|
|
|
$where_query2[] = ['company_id', '=', $company_id];
|
|
|
$where_query2[] = ['id', 'in', $employee_id_area];
|
|
|
@@ -355,7 +355,7 @@ class LowPriceProductJobs implements ShouldQueue
|
|
|
$where_query1[] = ['duty_type', '=', 2]; //责任类型1=第一责任人,2=责任人
|
|
|
}
|
|
|
//查询地区配置的员工
|
|
|
- $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['city_id'])->pluck('employee_id')->toarray();
|
|
|
+ $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['merge_city_id'])->pluck('employee_id')->toarray();
|
|
|
if (!empty($employee_id_area)) {
|
|
|
$where_query2[] = ['company_id', '=', $company_id];
|
|
|
$where_query2[] = ['id', 'in', $employee_id_area];
|