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

application/controllers/information.php

@@ -1099,6 +1099,7 @@ class Information extends CI_Controller
                 return array($recommand->ir_name => false);
                 break;
             default: //'rule_parent'://继承上级规则则留空，程序会循环一遍分组的规则
+                return false;
                 ;
         }
         //读取备用节点

application/third_party/recommend/controllers/index.php

@@ -68,7 +68,7 @@ class Index extends CI_Controller
             $data['infoRecommend']->ir_pointer_is_id = null;
             $data['infoRecommend']->ir_pointer_it_id = null;
             $data['infoRecommend']->ir_urls = '';
-            $data['infoRecommend']->ir_rule = 'no';
+            $data['infoRecommend']->ir_rule = 'rule_parent';
             $data['infoRecommend']->ir_datetime = time();
             $data['infoRecommend']->ir_sitecode = $this->config->item('site_code');
             $data['infoRecommend']->ir_id = $this->infoRecommends_model->add('infoRecommends', $data['infoRecommend']);