|
@@ -156,13 +156,9 @@ class EmployeeService extends Service
|
|
|
->select('number','mobile','emp_name','id','entry_time','leave_time','is_admin','state')
|
|
|
->orderBy('id','desc');
|
|
|
|
|
|
- if(! empty($data['depart_id'])) {
|
|
|
- $depart = Depart::where('del_time',0)
|
|
|
- ->select('id','parent_id')
|
|
|
- ->get()->toArray();
|
|
|
- $result = array_merge($this->getAllDescendants($depart,$data['depart_id']),[$data['depart_id']]);
|
|
|
+ if(! empty($data['depart'])) {
|
|
|
$employee_id = DB::table('employee_depart_permission')
|
|
|
- ->whereIn("depart_id", $result)
|
|
|
+ ->where("depart_id", $data['depart'])
|
|
|
->select("employee_id")
|
|
|
->get()->toArray();
|
|
|
$employee_id = array_column($employee_id,'employee_id');
|