|
@@ -248,8 +248,9 @@ class LowPriceGoodsDataJobs implements ShouldQueue
|
|
|
$where_query3[] = ['duty_type', '=', 1]; //责任类型1=第一责任人,2=责任人
|
|
$where_query3[] = ['duty_type', '=', 1]; //责任类型1=第一责任人,2=责任人
|
|
|
}
|
|
}
|
|
|
//并行查询第一责任人
|
|
//并行查询第一责任人
|
|
|
|
|
+ $EmployeeModel = new EmployeeModel();
|
|
|
$EmployeeModel = $EmployeeModel
|
|
$EmployeeModel = $EmployeeModel
|
|
|
- ->where(function ($q) use ($employee_id_list, $company_id) {
|
|
|
|
|
|
|
+ ->orWhere(function ($q) use ($employee_id_list, $company_id) {
|
|
|
if (!empty($employee_id_list)) {
|
|
if (!empty($employee_id_list)) {
|
|
|
$q->where('company_id', $company_id)
|
|
$q->where('company_id', $company_id)
|
|
|
->orWhereIn('id', $employee_id_list)
|
|
->orWhereIn('id', $employee_id_list)
|