From 40ddeae55acaa7a1274aaa2819fef14047b6b5b9 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Mon, 17 Feb 2020 09:17:17 +0800
Subject: [PATCH] upt

---
 Application/Admin/Controller/GameController.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php
index 4fe8865c9..8dae77abc 100644
--- a/Application/Admin/Controller/GameController.class.php
+++ b/Application/Admin/Controller/GameController.class.php
@@ -873,8 +873,8 @@ class GameController extends ThinkController
         ->alias('pdw')->field("pdw.*, p.partner, sum(s.pay_amount) as total_amount, group_concat(distinct(g.relation_game_name)) as game_name")
         ->join("tab_partner p on p.id = pdw.partner_id")
         ->join("tab_game g on pdw.partner_id = g.partner_id", 'left')
-        ->join('tab_spend s on s.game_id = g.id', 'left')
-        ->where(array_merge($map, ['s.pay_status'=>1]))
+        ->join('tab_spend s on s.game_id = g.id and s.pay_status = 1', 'left')
+        ->where($map)
         ->group('pdw.id, p.partner')
         ->page($p, $row)->select();
         $count = M('partner_divide_warn', 'tab_')->alias('pdw')->join("tab_game g on pdw.partner_id = g.partner_id", 'left')->where($map)->count();