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

Subscribe2.0

查看合并请求 !39

esf_core/core/MY_Model.php

@@ -135,7 +135,8 @@ class MY_Model extends CI_Model
     public function findAll() {
         $list = array();
         $query = $this->db->get($this->form_name);
-        $result = $query->result_array();
+//        $result = $query->result_array();
+        $result = $query->num_rows > 0 ? $query->result_array() : array();
         $sqls = $this->db->last_query();
 		//echo "<!--$sqls-->";
                 //echo $this->db->last_query();exit;

esf_core/models/user_model.php

@@ -845,12 +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');
-
+        writelog('：查询用户是否收藏: '.print_r($return,1), 'fangliyan_'.date('d') );
 		if(!empty($return[0]))
 		{
 			return $return[0];
@@ -991,6 +988,7 @@ class User_model extends MY_Model
         //取第一个
         $one_base_id = explode(',',$base_id);
 		$arr	= array('base_id'=>$one_base_id,'uid'=>$uid,'collect_id'=>$collect_id,'kind'=>$kind,'collect_value'=>$collect_value,'collect_time'=>time(),'city_name'=>$city,'infofrom'=>$infofrom,'passport_uid'=>$passport_uid);
+        writelog('：保存收藏addcollect: '.print_r($arr,1), 'fangliyan_'.date('d') );
 		//设置表
 		$this->user_model->set_table('personal_collection');
 		//过滤表结构