修改人员搜索

app/Service/EmployeeService.php

@@ -234,8 +234,10 @@ class EmployeeService extends Service
             $employee_id = array_column($employee_id,'employee_id');
             $model->whereIn("id", $employee_id);
         }else{
-            $employee_id = $this->getEmployee($user);
-            $model->whereIn('id',$employee_id);
+            if(! $user['is_all_depart']){
+                $employee_id = $this->getEmployee($user);
+                $model->whereIn('id',$employee_id);
+            }
         }
 
         if(! empty($data['number'])) $model->where('number', 'LIKE', '%'.$data['number'].'%');
@@ -711,7 +713,7 @@ class EmployeeService extends Service
             $depart_id = $this->getDepartIdListOfMySales($user);
             $model->whereIn('id', $depart_id);
         }else{
-            if($user['id'] != Employee::SPECIAL_ADMIN && ! $user['is_all_depart'] && empty($data['get_top'])){
+            if(! $user['is_all_depart']){
                 $depart_id = $this->getDepartIdList($user);
                 $model->whereIn('id',$depart_id);
             }