导出

app/Service/EmployeeService.php

@@ -942,20 +942,22 @@ class EmployeeService extends Service
             'employees' => [],
             'titleDepartments' => [],
         ];
+
+        //没有部门的人
+        $employee_id = EmployeeDepartPermission::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;
+
         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'])
@@ -964,19 +966,11 @@ class EmployeeService extends Service
                 ->get()->toArray();
             $childDepartments = $titleDepartments = [];
             foreach ($depart as $value){
-                if($value['parent_id'] == $data['parent_id']) $childDepartments[] = $value;
+                if($value['parentId'] == $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];