|
@@ -189,8 +189,12 @@ class EmployeeService extends Service
|
|
|
->orderBy('id','desc');
|
|
|
|
|
|
if(! empty($data['depart'])) {
|
|
|
+ $depart = Depart::where('del_time',0)
|
|
|
+ ->select('id','parent_id')
|
|
|
+ ->get()->toArray();
|
|
|
+ $result = array_merge($this->getAllDescendants($depart,$data['depart']),[$data['depart']]);
|
|
|
$employee_id = DB::table('employee_depart_permission')
|
|
|
- ->where("depart_id", $data['depart'])
|
|
|
+ ->whereIn("depart_id", $result)
|
|
|
->select("employee_id")
|
|
|
->get()->toArray();
|
|
|
$employee_id = array_column($employee_id,'employee_id');
|