Merge branch 'refs/heads/subscribe2.0' into release_dev_107

center/controllers/esf_center_api.php

@@ -968,9 +968,8 @@ class Esf_center_api extends MY_Controller {
     public function api_getsaveblock()
     {
         $telno = $this->input->get('telno');
-        $uid = $this->user_model->yztelno($telno);
-
-        if($uid==0)
+        $base_id = $this->input->get('base_id');
+        if(!$base_id)
         {
             echo serialize(array());exit;
         }
@@ -982,8 +981,8 @@ class Esf_center_api extends MY_Controller {
         $page = $page ? $page:1;
         $pagesize = $pagesize?$pagesize : 20;
         $offset = $pagesize * ($page-1);
+        $collect_array = $this->user_model->getcollectByBaseId($kind,$base_id,$offset,$pagesize,$city);
 
-        $collect_array = $this->user_model->getcollect($kind,$uid,$offset,$pagesize,$city);
         if(!empty($collect_array) && is_array($collect_array))
         {
             foreach($collect_array as $key=>$value)