|
|
@@ -79,8 +79,8 @@ class ViolationProduct extends Controller
|
|
|
$ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query) use ($company_name) {
|
|
|
$query->select('washconfig_violation_product_company.violation_product_logid')
|
|
|
->from('washconfig_violation_product_company')
|
|
|
- ->join('washconfig_violation_store', 'washconfig_violation_store.id', '=', 'washconfig_violation_product_company.company_id')
|
|
|
- ->where('washconfig_violation_store.company_name', 'like', "%$company_name%")
|
|
|
+ ->join('washconfig_violation_company', 'washconfig_violation_company.id', '=', 'washconfig_violation_product_company.company_id')
|
|
|
+ ->where('washconfig_violation_company.company_name', 'like', "%$company_name%")
|
|
|
->distinct('washconfig_violation_product_company.company_id');
|
|
|
});
|
|
|
}
|
|
|
@@ -107,8 +107,8 @@ class ViolationProduct extends Controller
|
|
|
$result['data'][$key]['company_name'] = ['全部公司'];
|
|
|
} else {
|
|
|
$company_data = $ViolationProductCompanyModel->where('violation_product_logid', $value['id'])
|
|
|
- ->join('washconfig_violation_store', 'washconfig_violation_store.id', '=', 'washconfig_violation_product_company.company_id')
|
|
|
- ->select(['washconfig_violation_store.id', 'washconfig_violation_store.company_name', 'washconfig_violation_product_company.company_id'])->get()->toArray();
|
|
|
+ ->join('washconfig_violation_company', 'washconfig_violation_company.id', '=', 'washconfig_violation_product_company.company_id')
|
|
|
+ ->select(['washconfig_violation_company.id', 'washconfig_violation_company.company_name', 'washconfig_violation_product_company.company_id'])->get()->toArray();
|
|
|
$result['data'][$key]['company_name'] = !empty($company_data) ? array_column($company_data, 'company_name') : '';
|
|
|
}
|
|
|
}
|
|
|
@@ -151,8 +151,8 @@ class ViolationProduct extends Controller
|
|
|
$data->company_ids = '';
|
|
|
} else {
|
|
|
$company_data = $ViolationProductCompanyModel->where('violation_product_logid', $data->id)
|
|
|
- ->join('washconfig_violation_store', 'washconfig_violation_store.id', '=', 'washconfig_violation_product_company.company_id')
|
|
|
- ->select(['washconfig_violation_store.id', 'washconfig_violation_store.company_name', 'washconfig_violation_product_company.company_id'])->get()->toArray();
|
|
|
+ ->join('washconfig_violation_company', 'washconfig_violation_company.id', '=', 'washconfig_violation_product_company.company_id')
|
|
|
+ ->select(['washconfig_violation_company.id', 'washconfig_violation_company.company_name', 'washconfig_violation_product_company.company_id'])->get()->toArray();
|
|
|
$data->company_name = !empty($company_data) ? array_column($company_data, 'company_name') : '';
|
|
|
$data->company_ids = !empty($company_data) ? array_column($company_data, 'company_id') : '';
|
|
|
}
|