Merge pull request '平台规则' (#632) from hotfix/center into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/632

Application/Home/Controller/PromoteController.class.php

@@ -207,8 +207,17 @@ class PromoteController extends BaseController
         $this->assign('todayAddSpendData', $todayAddSpendData);
         $this->assign('mounthAddSpendData', $mounthAddSpendData);
 
+
+        $promoteBelong = M('promote', 'tab_')->where(['id'=>get_pid()])->getField('company_belong');
+        if ($promoteBelong == 1 || $promoteBelong == 2) {
+            $compang_belongs = 1; 
+        }else {
+            $compang_belongs = 2; 
+        }
+
         // 规则弹窗事宜
         $rules = M("document_pop_rules")
+            ->where(['belongs' => $compang_belongs])
             //->where("(type = 1 and pop_time = {$currentTime}) or (type = 2 and pop_time = {$week})")
             ->order("sort asc, id desc")
             ->limit('0, 5')
@@ -216,12 +225,6 @@ class PromoteController extends BaseController
         $this->assign("rules", $rules);
         $this->assign("rules_count", count($rules));
 
-        $promoteBelong = M('promote', 'tab_')->where(['id'=>get_pid()])->getField('company_belong');
-        if ($promoteBelong == 1 || $promoteBelong == 2) {
-            $compang_belongs = 1; 
-        }else {
-            $compang_belongs = 2; 
-        }
         $belongs = M("document_pop_rules")
         ->where(['belongs' => $compang_belongs])->count();
         if (intval($belongs) > 0) {