|
@@ -868,9 +868,6 @@ class EmployeeService extends Service
|
|
|
return [200,['data' => $list,'tree' => $list_tree]];
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
/**
|
|
|
* 部门参数规则
|
|
|
* @param $data
|
|
@@ -937,6 +934,54 @@ class EmployeeService extends Service
|
|
|
return $bool;
|
|
|
}
|
|
|
|
|
|
+ public function departOaList($data,$user){
|
|
|
+ if(! isset($data['parent_id'])) return [false, '接口参数不存在'];
|
|
|
+
|
|
|
+ $return = [
|
|
|
+ 'childDepartments' => [],
|
|
|
+ 'employees' => [],
|
|
|
+ 'titleDepartments' => [],
|
|
|
+ ];
|
|
|
+ if(empty($data['parent_id'])){
|
|
|
+ $depart = Depart::where('del_time',0)
|
|
|
+ ->where('parent_id',0)
|
|
|
+ ->select('id','parent_id as parentId','code as departmentKey','title as departmentName')
|
|
|
+ ->get()->toArray();
|
|
|
+ $return['childDepartments'] = $depart;
|
|
|
+ $employee_id = EmployeeDepartPermission::whereIn('depart_id',array_column($depart,'id'))
|
|
|
+ ->select('employee_id')
|
|
|
+ ->get()->toArray();
|
|
|
+ $employee_id = array_unique(array_column($employee_id,'employee_id'));
|
|
|
+ $employee = Employee::whereIn('id',$employee_id)
|
|
|
+ ->select('id','emp_name as employeeName')
|
|
|
+ ->get()->toArray();
|
|
|
+ $return['employees'] = $employee;
|
|
|
+ }else{
|
|
|
+ $depart = Depart::where('del_time',0)
|
|
|
+ ->where('parent_id',$data['parent_id'])
|
|
|
+ ->orWhere('id',$data['parent_id'])
|
|
|
+ ->select('id','parent_id as parentId','code as departmentKey','title as departmentName')
|
|
|
+ ->get()->toArray();
|
|
|
+ $childDepartments = $titleDepartments = [];
|
|
|
+ foreach ($depart as $value){
|
|
|
+ if($value['parent_id'] == $data['parent_id']) $childDepartments[] = $value;
|
|
|
+ if($value['id'] == $data['parent_id']) $titleDepartments[] = $value;
|
|
|
+ }
|
|
|
+ $return['childDepartments'] = $childDepartments;
|
|
|
+ $return['titleDepartments'] = $titleDepartments;
|
|
|
+ $employee_id = EmployeeDepartPermission::whereIn('depart_id',array_column($childDepartments,'id'))
|
|
|
+ ->select('employee_id')
|
|
|
+ ->get()->toArray();
|
|
|
+ $employee_id = array_unique(array_column($employee_id,'employee_id'));
|
|
|
+ $employee = Employee::whereIn('id',$employee_id)
|
|
|
+ ->select('id','emp_name as employeeName')
|
|
|
+ ->get()->toArray();
|
|
|
+ $return['employees'] = $employee;
|
|
|
+ }
|
|
|
+
|
|
|
+ return [true, $return];
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 班组编辑
|
|
|
* @param $data
|