From 51c4b07eeaa358c780f46b3421db76bd2fdec2c5 Mon Sep 17 00:00:00 2001
From: chenzhi <294767167@11qq.com>
Date: Sat, 25 Jul 2020 09:05:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E6=B8=B8=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E5=8C=85=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/CompanyStatementSetController.class.php    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index 05ae0c7ee..d0c97716d 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -361,7 +361,7 @@ class CompanyStatementSetController extends Controller {
 	{
 		$game_where = "partner_id in ({$cp_id})";
 		$game = M('game','tab_');
-		$gameDbRes = $game->field("id,relation_game_name as game_name,partner_id as cp_id,original_package_name")->where($game_where)->select();
+		$gameDbRes = $game->field("id,relation_game_name as game_name,partner_id as cp_id,original_package_name,select_package_name")->where($game_where)->select();
 		$gameList=[];
 		foreach ($gameDbRes as $k => $v) {
 			$gameList[$v['id']] =$v;
@@ -392,7 +392,11 @@ class CompanyStatementSetController extends Controller {
 			if(empty($v['original_package_name'])){
 				$game_name = $v['game_name'];
 			}else{
-				$game_name = $v['original_package_name'];
+                if($v['select_package_name'] == 1){
+                    $game_name = $v['original_package_name'];
+                }else{
+                    $game_name = $v['game_name'];
+                }
 			}
 			$cp_id = $v['cp_id'];
 			unset($v['cp_id']);