修改接口;网民留言-获取列表

app/JsonRpc/NewsService.php

@@ -9073,11 +9073,11 @@ class NewsService implements NewsServiceInterface
   {
     $where = [];
     if($data['is_master'] == 1){
-      $where['status'] = 1;
+      $where['message.status'] = 1;
     }else if($data['is_master'] == 2){
-      $where['status'] = 2;
+      $where['message.status'] = 2;
     }else if($data['is_master'] == 3){
-      $where['status'] = 0;
+      $where['message.status'] = 0;
     }
     $user = User::where('id', $data['user_id'])->first();
     if (empty($user)) {
@@ -9085,7 +9085,7 @@ class NewsService implements NewsServiceInterface
     }
     $column_arr_id = [];
     if($user['type_id'] != 10000 && !empty($data['website_id'])){
-      $where['user_id'] = $data['user_id'];
+      $where['message.user_id'] = $data['user_id'];
       $web = Website::where('id',$data['website_id'])->first('website_column_arr_id');
       if(empty($web)){
         return Result::error('此网站未关联任何网站属性！');
@@ -9093,16 +9093,18 @@ class NewsService implements NewsServiceInterface
       $column_arr_id = json_decode($web['website_column_arr_id'],true);
     }
     if(!empty($data['title'])){
-      array_push($where, ['title', 'like', '%'.$data['title'].'%']);
+      array_push($where, ['message.title', 'like', '%'.$data['title'].'%']);
     }
 
     $result = Message::when($data['is_master'] == 0, function ($query) {
-        $query->whereIn('status', [0, 2]);
+        $query->whereIn('message.status', [0, 2]);
       })
       ->when(!empty($where), function ($query) use ($where) {
         $query->where($where);
       })
-      ->orderBy('updated_at', 'desc')
+      ->leftJoin('user', 'message.user_id', '=', 'user.id')
+      ->select('message.*', 'user.nickname')
+      ->orderBy('message.updated_at', 'desc')
       ->paginate($data['page_size'], ['*'], 'page', $data['page']);
     if(empty($result->items())) {
       return Result::error('留言不存在!');
@@ -9212,10 +9214,25 @@ class NewsService implements NewsServiceInterface
       // 截取 100 个字符
       $data['description'] = mb_substr($content, 0, 100);
     }
+    $data['level'] = empty($data['level']) ? null : $data['level'];
+    $data['province_id'] = empty($data['province_id']) ? null : $data['province_id'];
+    $data['city_id'] = empty($data['city_id']) ? null : $data['city_id'];
+    $data['due_time'] = empty($data['due_time']) ? null : $data['due_time'];
+    $users_id = empty($data['users_id']) ? null : $data['users_id'];
+    unset($data['users_id']);
+    // return Result::success($data);
     $result = ResearchTopic::insertGetId($data);
     if (empty($result)) {
       return Result::error('添加失败');
     }
+    $users = json_decode($data['users_id'] ?? '[]',true);
+    if(!empty($users)){
+      foreach($users as $key => $value){
+        $users[$key]['user_id'] = $value;
+        $users[$key]['retopic_id'] = $result;
+      }
+      $retopic_user = RetopicUser::insert($users);
+    }
     return Result::success($result);
   }
 }