未上报数据销售优化

app/Http/Controllers/Admin/CustReportController.php

@@ -738,7 +738,6 @@ class custReportController extends Controller
         //销售团队
         $team_ids = Admin::getTeams();
         $ids = DB::table('admin_role')->where('user_id','!=',3)->where('role_name', '销售')->lists('user_id');
-        $ids = DB::table('admin')->whereIn('id', $ids)->where('is_use', 1)->whereIn('team_id', $team_ids)->lists('id');
         //销售名字
         $salers = DB::table('admin')->whereIn('id', $ids)->lists('realname', 'id');
  
@@ -754,7 +753,7 @@ class custReportController extends Controller
 
         $ret = array();
         foreach($data as $k=>$v){
-            $ids = DB::table('admin')->whereIn('id', $ids)->where('create_time','<',$k)->lists('id');
+            $ids = DB::table('admin')->whereIn('id', $ids)->where('is_use', 1)->whereIn('team_id', $team_ids)->where('create_time','<',$k)->lists('id');
             $diff = array_diff($ids, $v);
             if(!empty($diff)){
                 //名字带入