1

app/Service/CustomerService.php

@@ -501,8 +501,11 @@ class CustomerService extends Service
             ->select('title','id','model_type','customer_intention','customer_from','customer_type','car_type','consulting_product','intention_product','progress_stage','address1','address2','crt_id','crt_time','mark','importance','company','company_short_name','depart_id','state_type','customer_state','customer_grade','pond_state')
             ->orderby('id', 'desc');
 
-        if(empty($data['pond_state'])) { // 未进入公海池的
-            //getALL传入后无视设置范围
+        if(! empty($data['pond_state'])) {
+            // 进入公海池的客户 所有人可见
+            $model->where('pond_state', '>',0);
+        }else{
+            // 未进入公海池的   getALL传入后无视设置范围
             if(empty($data['getAll']) && $user['id'] != Employee::SPECIAL_ADMIN) {
                 $user_id = $user['id'];
                 $depart_id = $user['depart_range'];
@@ -519,8 +522,6 @@ class CustomerService extends Service
                 $emp_id = array_unique(array_column($customer_id,'customer_id'));
                 $model->whereIn('id', $emp_id);
             }
-        }else{
-            $model->where('pond_state', '>',0);
         }
         if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
         if(! empty($data['time_type'])) {