合并分支 'heshupeng' 到 'master'

代码修改



查看合并请求 !244

@@ -604,7 +604,8 @@ class Lists extends Api
         $page = $this->request->param('page', 1, 'intval');
         $pageNum = $this->request->param('pageNum', 10, 'intval');
         $qiniu = get_addon_config('qiniu')['cdnurl'];
-        $user_id = Session::get('user_id');
+//        $user_id = Session::get('user_id');
+        $user_id = $this->auth->id;
         $where['expirationtime'] = ['>',time()];
         $data['total_num'] = Db::name('study')
             ->where($where)
@@ -686,7 +687,8 @@ class Lists extends Api
         $page = $this->request->param('page', 1, 'intval');
         $pageNum = $this->request->param('pageNum', 10, 'intval');
         $qiniu = get_addon_config('qiniu')['cdnurl'];
-        $user_id = Session::get('user_id');
+//        $user_id = Session::get('user_id');
+        $user_id = $this->auth->id;
         $where['expirationtime'] = ['>',time()];
         $data['total_num'] = Db::name('study')
             ->where($where)