小高薪

app/Service/EmployeeService.php

@@ -871,13 +871,18 @@ class EmployeeService extends Service
     }
 
     public function fillDepartList($list,$user, $is_export = false){
+        if(isset($list['data'])){
+            $data = $list['data'];
+        }else{
+            $data = $list;
+        }
         if($is_export){
             $map = Depart::where('del_time',0)
-                ->whereIn('id', array_column($list['data'], 'parent_id'))
+                ->whereIn('id', array_column($data, 'parent_id'))
                 ->select('code','id', 'title')
                 ->get()->toArray();
             $map = array_column($map,null,'id');
-            foreach ($list['data'] as $key => $value){
+            foreach ($data as $key => $value){
                 $tmp = $map[$value['parent_id']] ?? "";
                 if($tmp['code'] == $user['top_depart_code']) {
                     $code = $title = "";
@@ -885,12 +890,12 @@ class EmployeeService extends Service
                     $code = $tmp['code'];
                     $title = $tmp['title'];
                 }
-                $list['data'][$key]['parent_code'] = $code;
-                $list['data'][$key]['parent_title'] = $title;
+                $data[$key]['parent_code'] = $code;
+                $data[$key]['parent_title'] = $title;
             }
         }
 
-        return $list;
+        return $data;
     }