Merge branch 'master' of git.mycht.cn:developers/information-system

application/third_party/tripadvisor_spider/controllers/index.php

@@ -18,7 +18,7 @@ class Index extends CI_Controller {
         $this->permission->is_admin();
         $data = array();
         $data['city'] = $city;
-        $data['ta_review_list'] = $this->Tripadvisor_Review_model->search(30, $data['city']);
+        $data['ta_review_list'] = $this->Tripadvisor_Review_model->search(200, $data['city']);
         $this->load->view('bootstrap3/header', $data);
         $this->load->view('welcome');
         $this->load->view('bootstrap3/footer');

application/third_party/tripadvisor_spider/models/Tripadvisor_Review_model.php

@@ -99,6 +99,9 @@ class Tripadvisor_Review_model extends CI_Model {
     }
 
     public function find_group($city, $start_date, $end_date) {
+		if($city=='Panda'){
+			$city='chengdu';
+		}
         $sql = "
                 SELECT top 100 GRI_No
                       ,coli_id