Merge branch 'feature/add_item_other' of wmtx/platform into master

市场业绩比例永久判断bug修改

Application/Admin/Controller/TimingController.class.php

@@ -872,7 +872,7 @@ class TimingController extends AdminController {
 //
         $company_data = M('promote_company','tab_')
             ->field("company_belong")
-            ->where("id=$company_id")
+            ->where("id={$company_id}")
             ->find();
 //
 //        $game_ratio_mould = M("game_ratio_mould","tab_")
@@ -1211,6 +1211,10 @@ class TimingController extends AdminController {
 
                 $ungame_ids = explode(',',$cv['game_ids']);
 
+                if ($cv['end_time'] == 0 || !$cv['end_time']) {
+                    $cv['end_time'] = 99999999999;
+                }
+
                 $use_begin = 0;
                 $use_end = 0;
                 if ($value['is_settlement'] == '0') {