@@ -806,7 +806,29 @@ class User_model extends MY_Model
...
@@ -806,7 +806,29 @@ class User_model extends MY_Model
if($jmz==1){
if($jmz==1){
$uidnum=$this->get_data(array('form_name'=>'personal_collection','where'=>array('passport_uid'=>$uid,'kind'=>$kind,'city_name'=>$city),'select'=>array('count(*) as num')),'esfbak');
$uidnum=$this->get_data(array('form_name'=>'personal_collection','where'=>array('passport_uid'=>$uid,'kind'=>$kind,'city_name'=>$city),'select'=>array('count(*) as num')),'esfbak');
}else{
}else{
$uidnum=$this->get_data(array('form_name'=>'personal_collection','where'=>array('uid'=>$uid,'kind'=>$kind,'city_name'=>$city),'select'=>array('count(*) as num')),'esfbak');
$uidnum=$this->get_data(array('form_name'=>'personal_collection','where'=>"base_id in ($base_id_where) and kind=$kind and city_name='$city'",'select'=>array('count(*) as num')),'esfbak');
}else{
$uidnum=$this->get_data(array('form_name'=>'personal_collection','where'=>array('uid'=>$uid,'kind'=>$kind,'city_name'=>$city),'select'=>array('count(*) as num')),'esfbak');
}
}
}
...
@@ -1098,12 +1120,35 @@ class User_model extends MY_Model
...
@@ -1098,12 +1120,35 @@ class User_model extends MY_Model
$collect_array=$this->get_data(array('form_name'=>'personal_collection','where'=>"base_id in ($base_id_where) and kind=$kind and city_name='$city'",'limit'=>$pagesize,'offset'=>$offset,'order_by'=>'collect_time desc'),'esfbak');