合并分支 'dev_yh' 到 'release'

查询

查看合并请求 !41

esf_core/models/user_model.php

@@ -846,7 +846,10 @@ class User_model extends MY_Model
             $where_string .= " and kind = $kind";
         }
 
-        $return =  $this->get_data(array('form_name' => 'personal_collection','where'=>$where_string,'select'=>array('id')),'esf');
+//        $return =  $this->get_data(array('form_name' => 'personal_collection','where'=>$where_string,'select'=>array('id')),'esf');
+        $sql = "select id from personal_collection where ".$where_string;
+        $query = $this->db_esfbak->query($sql);
+        $return = $query->result_array();
         writelog('：查询用户是否收藏: '.print_r($return,1), 'fangliyan_'.date('d') );
 		if(!empty($return[0]))
 		{