|
@@ -341,7 +341,7 @@ class ViolationCompanyDataJobs implements ShouldQueue
|
|
|
|
|
|
|
|
//当以上规则匹配不到责任人时,则去查询发货地区信息关联责任人
|
|
//当以上规则匹配不到责任人时,则去查询发货地区信息关联责任人
|
|
|
if (trim($first_responsible_person) == '' && trim($product_data['shipment_city_id']) != '') {
|
|
if (trim($first_responsible_person) == '' && trim($product_data['shipment_city_id']) != '') {
|
|
|
- $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['city_id'])->pluck('employee_id')->toarray();
|
|
|
|
|
|
|
+ $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['shipment_city_id'])->pluck('employee_id')->toarray();
|
|
|
if (!empty($employee_id_area)) {
|
|
if (!empty($employee_id_area)) {
|
|
|
$where_city[] = ['company_id', '=', $company_id];
|
|
$where_city[] = ['company_id', '=', $company_id];
|
|
|
$where_city[] = ['id', 'in', $employee_id_area];
|
|
$where_city[] = ['id', 'in', $employee_id_area];
|
|
@@ -410,7 +410,7 @@ class ViolationCompanyDataJobs implements ShouldQueue
|
|
|
|
|
|
|
|
//当以上规则匹配不到责任人时,则去查询发货地区信息关联责任人
|
|
//当以上规则匹配不到责任人时,则去查询发货地区信息关联责任人
|
|
|
if (trim($responsible_person) == '' && trim($product_data['shipment_city_id']) != '') {
|
|
if (trim($responsible_person) == '' && trim($product_data['shipment_city_id']) != '') {
|
|
|
- $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['city_id'])->pluck('employee_id')->toarray();
|
|
|
|
|
|
|
+ $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['shipment_city_id'])->pluck('employee_id')->toarray();
|
|
|
if (!empty($employee_id_area)) {
|
|
if (!empty($employee_id_area)) {
|
|
|
$where_city[] = ['company_id', '=', $company_id];
|
|
$where_city[] = ['company_id', '=', $company_id];
|
|
|
$where_city[] = ['id', 'in', $employee_id_area];
|
|
$where_city[] = ['id', 'in', $employee_id_area];
|