Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -153,6 +153,10 @@ class ComController extends BaseController
         if($projectCode != 1){
         if($projectCode != 1){
             $data[] = 50;
             $data[] = 50;
         }
         }
+        $is_subscribe = $this->getIsSubscribe();
+        if(!$is_subscribe){
+            $data[] = 52;
+        }
         if(!empty($data)){
         if(!empty($data)){
             $this->map['id'] = ['not in',$data];
             $this->map['id'] = ['not in',$data];
         }
         }

@@ -24,7 +24,7 @@ class CommentController extends BaseController
      */
      */
     public function lists(){
     public function lists(){
         $commentModel = new Comment();
         $commentModel = new Comment();
-        $lists = $commentModel->list();
+        $lists = $commentModel->lists($this->map,$this->page,$this->row);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }