1

app/Service/EmployeeService.php

@@ -2,6 +2,7 @@
 
 namespace App\Service;
 
+use App\Model\BasicType;
 use App\Model\Depart;
 use App\Model\DepartPriceName;
 use App\Model\Employee;
@@ -495,7 +496,7 @@ class EmployeeService extends Service
                 $model->title = $value['title'];
                 $model->code = $value['code'];
                 $model->is_main = $value['is_main'];
-                $model->grade = $value['grade'];
+                $model->basic_type_id = $value['basic_type_id'] ?? 0;
                 $model->save();
 
                 if(empty($value['parent_id'])){
@@ -557,7 +558,7 @@ class EmployeeService extends Service
      */
     public function departList($data,$user){
         $model = Depart::where('del_time',0)
-            ->select('title','id','code','parent_id','is_main','grade')
+            ->select('title','id','code','parent_id','is_main','basic_type_id')
             ->orderby('code', 'asc');
 
         if($user['id'] != Employee::SPECIAL_ADMIN && ! $user['is_all_depart']){
@@ -568,6 +569,7 @@ class EmployeeService extends Service
         if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
 
         $list = $model->get()->toArray();
+        $list = $this->fillDepartList($list);
         $list_tree = $list;
         if(! empty($list_tree)) {
             $list_tree = $this->makeTree(0,$list_tree);
@@ -580,16 +582,12 @@ class EmployeeService extends Service
     public function fillDepartList($list){
         if(empty($list)) return $list;
 
-        $name = DepartPriceName::where('del_time',0)
-            ->whereIn('depart_id', array_column($list,'id'))
-            ->select('depart_id','title','id')
-            ->get()->toArray();
-        $map = array_column($name,null,'depart_id');
+        $basic = BasicType::where('del_time',0)
+            ->whereIn('id', array_unique(array_column($list,'basic_type_id')))
+            ->pluck('title','id')->toArray();
 
         foreach ($list as $key => $value){
-            if(empty($value['parent_id'])){
-                $list[$key]['dapart_set'] = $map[$value['id']] ?? [];
-            }
+            $list[$key]['basic_type_title'] = $basic[$value['basic_type_id']] ?? '';
         }
 
         return $list;