合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !3053

@@ -339,7 +339,7 @@ class GeoQuestionRes extends Command
         $key = 'geo_task_list';
         $key = 'geo_task_list';
         $task_id = Redis::rpop($key);
         $task_id = Redis::rpop($key);
         if(empty($task_id)){
         if(empty($task_id)){
-            $project_ids = GeoQuestion::where('status', GeoQuestion::STATUS_OPEN)->where('next_time', '<=', date('Y-m-d'))->orderBy('next_time', 'asc')->distinct()->pluck('project_id');
+            $project_ids = GeoQuestion::where('status', GeoQuestion::STATUS_OPEN)->where('next_time', '<=', date('Y-m-d'))->orderBy('next_time', 'asc')->groupBy('project_id')->pluck('project_id');
             if(!empty($project_ids)){
             if(!empty($project_ids)){
                 foreach ($project_ids as $project_id){
                 foreach ($project_ids as $project_id){
                     $ids = GeoQuestion::where(['project_id' => $project_id, 'status' => GeoQuestion::STATUS_OPEN])->where('next_time', '<=', date('Y-m-d'))->pluck('id');
                     $ids = GeoQuestion::where(['project_id' => $project_id, 'status' => GeoQuestion::STATUS_OPEN])->where('next_time', '<=', date('Y-m-d'))->pluck('id');