|
@@ -77,17 +77,17 @@ class ViolationProduct extends Api
|
|
|
|
|
|
|
|
// 第一责任人名称查询
|
|
// 第一责任人名称查询
|
|
|
if($first_responsible_person_name){
|
|
if($first_responsible_person_name){
|
|
|
- $first_responsible_person_id = $ViolationProductMemberModel->where('name', 'like', "%$first_responsible_person_name%")->pluck('department_id')->toarray();
|
|
|
|
|
|
|
+ $first_responsible_person_id = $ViolationProductMemberModel->where('employee_name', 'like', "%$first_responsible_person_name%")->pluck('violation_product_logid')->toarray();
|
|
|
$ViolationProductModel = $ViolationProductModel->whereIn('id',$first_responsible_person_id);
|
|
$ViolationProductModel = $ViolationProductModel->whereIn('id',$first_responsible_person_id);
|
|
|
}
|
|
}
|
|
|
// 责任人名称查询
|
|
// 责任人名称查询
|
|
|
if($responsible_person_name){
|
|
if($responsible_person_name){
|
|
|
- $responsible_person_id = $ViolationProductMemberModel->where('name', 'like', "%$responsible_person_name%")->pluck('department_id')->toarray();
|
|
|
|
|
|
|
+ $responsible_person_id = $ViolationProductMemberModel->where('employee_name', 'like', "%$responsible_person_name%")->pluck('violation_product_logid')->toarray();
|
|
|
$ViolationProductModel = $ViolationProductModel->whereIn('id',$responsible_person_id);
|
|
$ViolationProductModel = $ViolationProductModel->whereIn('id',$responsible_person_id);
|
|
|
}
|
|
}
|
|
|
// 来源责任人名称查询
|
|
// 来源责任人名称查询
|
|
|
if($source_responsible_person_name){
|
|
if($source_responsible_person_name){
|
|
|
- $source_responsible_person_id = $ViolationProductMemberModel->where('name', 'like', "%$source_responsible_person_name%")->pluck('department_id')->toarray();
|
|
|
|
|
|
|
+ $source_responsible_person_id = $ViolationProductMemberModel->where('employee_name', 'like', "%$source_responsible_person_name%")->pluck('violation_product_logid')->toarray();
|
|
|
$ViolationProductModel = $ViolationProductModel->whereIn('id',$source_responsible_person_id);
|
|
$ViolationProductModel = $ViolationProductModel->whereIn('id',$source_responsible_person_id);
|
|
|
}
|
|
}
|
|
|
|
|
|