合并分支 'lyh-server' 到 'master'

gx



查看合并请求 !1772

@@ -32,8 +32,8 @@ class GoogleLinkController extends BaseController
             $data = $linkService->linkPageData($this->user['domain'],$this->user['project_id']);
             $data = $linkService->linkPageData($this->user['domain'],$this->user['project_id']);
             $lists = paginateArray($data,$this->page,$this->row);
             $lists = paginateArray($data,$this->page,$this->row);
         }
         }
-        $lists['y_total'] = $linkModel->counts(['status'=>1]);
-        $lists['n_total'] = $linkModel->counts(['status'=>0]);
+        $lists['y_total'] = $linkModel->counts(['status'=>1,'project_id'=>$this->user['project_id']]);
+        $lists['n_total'] = $linkModel->counts(['status'=>0,'project_id'=>$this->user['project_id']]);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }