合并分支 'subscribe2.0' 到 'release'

Subscribe2.0

查看合并请求 !38

center/controllers/esf_center_api.php

@@ -1289,7 +1289,7 @@ class Esf_center_api extends MY_Controller {
         $blockid = $this->input->get('id');
         $city = $this->input->get('city');
         $city = $city ? $city : 'nj';
-        $result = $this->user_model->getusercollectid($uid,$blockid,$city);
+        $result = $this->user_model->getusercollectid($uid,$blockid,$city,$kind);
         
         //已关注此房源
         if( $result > 0 )

esf_core/models/user_model.php

@@ -845,6 +845,9 @@ class User_model extends MY_Model
         if($kind){
             $where_string .= " and kind = $kind";
         }
+        if(!empty($_GET['fangliyan'])){
+            print_r($where_string);exit;
+        }
 
         $return =  $this->get_data(array('form_name' => 'personal_collection','where'=>$where_string,'select'=>array('id')),'esf');