wesmiler 报恩寺项目提交

app/Http/Controllers/Api/v1/EnshrineController.php

@@ -115,7 +115,7 @@ class EnshrineController extends BaseController
      * @return mixed
      */
     public function notice(){
-        return $this->noticeService->getDataList($this->userId);
+        return $this->noticeService->getDataList();
     }
 
     /**

app/Services/EnshrineNoticeService.php

@@ -40,16 +40,20 @@ class EnshrineNoticeService extends BaseService
      * @param $userId
      * @return array
      */
-    public function getDataList($userId){
+    public function getDataList(){
         $params = request()->all();
         $page = isset($params['pageSize']) ? intval($params['pageSize']) : PAGE;
         $pageSize = isset($params['pageSize']) ? intval($params['pageSize']) : PERPAGE;
         $type = isset($params['type'])? $params['type'] : 1;
         $isHide = isset($params['is_hide'])? $params['is_hide'] : 1;
-
+        $userId = isset($params['user_id'])? $params['user_id'] : 0;
+        $where = ['a.type'=> $type,'a.is_hide'=> $isHide,'a.mark'=>1,'a.status'=> 1];
+        if($userId){
+            $where['a.user_id'] = $userId;
+        }
         $dataList = $this->model::from('enshrine_notices as a')
             ->leftJoin('member as m','m.id','=','a.user_id')
-            ->where(['a.type'=> $type,'a.is_hide'=> $isHide,'a.mark'=>1,'a.user_id'=> $userId,'a.status'=> 1])
+            ->where($where)
             ->select(['a.*','m.avatar','m.nickname'])
             ->orderBy('a.create_time', 'desc')
             ->paginate($pageSize);