Merge branch 'master' of github.com:hainatravel/information-system into master

application/config/config.php

@@ -761,6 +761,7 @@ $config['css_source_tbt'] = 'https://www.tibetguru.com/css/style.css';
 $config['css_source_mbj'] = 'https://www.mybeijingchina.com/css/layout.css';
 $config['css_source_yz'] = 'https://www.yangtzeriver.org/css/css3/bootstrap/bootstrap.css';
 $config['css_source_ah'] = 'https://data.asiahighlights.com/css/mobile-first.css';
+$config['css_source_jh'] = 'https://data.japanhighlights.com/css/mobile-first.css';
 $config['css_source_gh'] = 'https://data.globalhighlights.com/css/gh-global.css';
 $config['css_source_ct'] = 'https://data.chinatravel.com/css/min.php?f=/css/css3/bootstrap/bootstrap.css,/css/css3/style.css,/css/css3/destination-details.css';
 $config['css_source_chinatravel'] = 'https://data.chinatravel.com/css/newcss3/base.css';

application/models/infoaccessmanage_model.php

@@ -34,7 +34,7 @@ class infoAccessmanage_model extends CI_Model
             $author[$v->a_id]=$v->a_name;
         }
         foreach ($result as $r) {
-            if(is_numeric($r->iam_author)) {
+            if(is_numeric($r->iam_author) && $r->iam_author!==1) {
                 $r->name=$author[$r->iam_author];
             }elseif (is_null($r->name)) {
                 $r->name=$r->iam_author;