Wesmiler

app/Services/Api/MeetingService.php

@@ -11,16 +11,12 @@
 
 namespace App\Services\Api;
 
-use App\Models\ArticleCateModel;
-use App\Models\ArticleConsultRecordsModel;
-use App\Models\ArticleModel;
 use App\Models\CityModel;
 use App\Models\MeetingModel;
 use App\Models\MeetingRecordsModel;
 use App\Models\SupervisorsModel;
 use App\Models\UserModel;
 use App\Services\BaseService;
-use App\Services\ConfigService;
 use App\Services\MpService;
 use App\Services\RedisService;
 
@@ -120,10 +116,10 @@ class MeetingService extends BaseService
     public function getDataList($params, $pageSize = 15)
     {
         $query = $this->getQuery($params);
-        $list = $query->select(['meeting.*'])
+        $list = $query->select(['meetings.*'])
             ->withCount(['records'])
-            ->orderBy('meeting.sort','desc')
-            ->orderBy('meeting.id','desc')
+            ->orderBy('meetings.sort','desc')
+            ->orderBy('meetings.id','desc')
             ->paginate($pageSize > 0 ? $pageSize : 9999999);
         $list = $list? $list->toArray() :[];
         if($list){
@@ -146,31 +142,31 @@ class MeetingService extends BaseService
      */
     public function getQuery($params)
     {
-        $where = ['meeting.status'=>0,'meeting.mark' => 1];
+        $where = ['meetings.status'=>0,'meetings.mark' => 1];
         $status = isset($params['status']) && $params['status']? intval($params['status']) : 1;
         if($status>0){
-            $where['meeting.status'] = $status;
+            $where['meetings.status'] = $status;
         }else{
-            unset($where['meeting.status']);
+            unset($where['meetings.status']);
         }
 
         return $this->model->with(['member'])
-            ->from('meeting')
-            ->leftJoin('meeting_records','meeting_records.meeting_id','meeting.id')
+            ->from('meetings')
+            ->leftJoin('meetings_records','meetings_records.meeting_id','meetings.id')
             ->where($where)
             ->where(function ($query) use($params){
                 $keyword = isset($params['keyword'])? $params['keyword'] : '';
                 if($keyword){
-                    $query->where('a.title','like',"%{$keyword}%");
+                    $query->where('meetings.title','like',"%{$keyword}%");
                 }
 
                 $type = isset($params['type'])? $params['type'] : 0;
                 $userId = isset($params['user_id'])?$params['user_id'] : 0;
                 // 我组织的
                 if($type==1){
-                    $query->where('meeting.user_id', $userId);
+                    $query->where('meetings.user_id', $userId);
                 }else if($type == 2){
-                    $query->where('meeting_records.user_id', $userId)->where('meeting_records.mark',1);
+                    $query->where('meetings_records.user_id', $userId)->where('meetings_records.mark',1);
                 }
 
             });