团队

app/Service/StatisticService.php

@@ -1066,8 +1066,12 @@ class StatisticService extends StatisticCommonService
             ->where('i.del_time', 0)
             ->where('i.type', ItemDetails::type_one);
         $model = $model->leftJoin('employee as e', 'i.data_id', '=', 'e.id');
+        $model = $model->leftJoin('item as it', 'it.id', '=', 'i.item_id');
 
-        $fields = ['e.id', 'e.title', 'e.education', 'e.major','e.p_title','i.item_id'];
+        if(! empty($data['title'])) $model->where('e.title', 'LIKE', '%'.$data['title'].'%');
+        if(! empty($data['item_title'])) $model->where('it.title', 'LIKE', '%'.$data['item_title'].'%');
+
+        $fields = ['e.id', 'e.title', 'e.education', 'e.major','e.p_title','i.item_id','it.title as item_title'];
 
         $list = $model->select($fields)
             ->orderBy('i.id', 'desc')
@@ -1094,14 +1098,9 @@ class StatisticService extends StatisticCommonService
             }
         }
 
-        $item_map = Item::whereIn('id',array_unique(array_column($list,'item_id')))
-            ->pluck('title','id')
-            ->toArray();
         foreach ($list as $key => $value){
             $depart_title = $man_map[$value['id']] ?? "";
             $list[$key]['depart_title'] = $depart_title;
-            $item_title = $item_map[$value['item_id']] ?? "";
-            $list[$key]['item_title'] = $item_title;
             $list[$key]['education'] = Employee::Education[$value['education']] ?? '';
         }