|
|
@@ -124,7 +124,9 @@ class ViolationProductDataJobs implements ShouldQueue
|
|
|
];
|
|
|
//获取公司绑定责任人信息
|
|
|
$company_data = $ViolationStoreModel->leftjoin('washconfig_company_category', 'washconfig_company_category.id', '=', 'washconfig_violation_store.category_id')
|
|
|
- ->where('washconfig_violation_store.social_credit_code', $product_data['qualification_number'])->select(['washconfig_violation_store.id', 'washconfig_company_category.name as category_name'])->first();
|
|
|
+ ->where('washconfig_violation_store.social_credit_code', $product_data['qualification_number'])
|
|
|
+ ->where('washconfig_violation_store.company_id', $company_id)
|
|
|
+ ->select(['washconfig_violation_store.id', 'washconfig_company_category.name as category_name'])->first();
|
|
|
$employee_id_list = [];
|
|
|
if ($company_data) {
|
|
|
$employee_id_list = $ViolationCompanyMemberModel->where('company_logid', $company_data->id)->pluck('employee_id')->toarray();
|
|
|
@@ -132,6 +134,8 @@ class ViolationProductDataJobs implements ShouldQueue
|
|
|
}
|
|
|
//获取指定责任人信息
|
|
|
if ($specify_responsible_person == 0) {
|
|
|
+ //查询指定公司责任人
|
|
|
+ $EmployeeModel = $EmployeeModel->where('company_id', $company_id);
|
|
|
//查询配置的第一责任人
|
|
|
$where_query1 = [];
|
|
|
if (!empty($employee_id_list)) {
|
|
|
@@ -147,6 +151,7 @@ class ViolationProductDataJobs implements ShouldQueue
|
|
|
//查询配置的责任人
|
|
|
$where_query2 = [];
|
|
|
$EmployeeModel = new EmployeeModel();
|
|
|
+ $EmployeeModel = $EmployeeModel->where('company_id', $company_id);
|
|
|
if (!empty($employee_id_list)) {
|
|
|
$EmployeeModel = $EmployeeModel->whereIn('id', $employee_id_list);
|
|
|
} else {
|