Merge branch 'feature/add_item' of wmtx/platform into release

11月bug修复
4 years ago · 3f7c20c3ab
parent e179d507e8 0e67e37436
commit 3f7c20c3ab
1 changed files with 1 additions and 1 deletions
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@ -2215,7 +2215,7 @@ class CompanyStatementSetController extends Controller {
        foreach ($relation_game_ids as $key => $value) {
            $turnover_type = $this->getTurnoverType($value,$company_id,$begintime,$endtime);

-            if ($turnover_type == 3 || $turnover_type == 4) {
+            if ($turnover_type == 2 || $turnover_type == 3 || $turnover_type == 4) {

                $mercy_game = M("game",'tab_')->field("original_package_name")->where(['relation_game_id'=>$value])->find()['original_package_name'];