From 1717c2958b0ff956ff07ae767b6f5092e4983d06 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 26 Nov 2020 16:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=80=BC=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/MarketPercentageController.class.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index 9dd1205ee..14c4b2f2b 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -1616,9 +1616,16 @@ class MarketPercentageController extends ThinkController
 
             }
 
-            $belong_game = M("company_belong_game","tab_")
-                ->where("((begin_time<={$time_start} and (end_time >={$time_start} or end_time=0)) or (begin_time<={$time_end} and end_time >={$time_end}) or (end_time>={$time_start} and end_time <={$time_end})) and id != {$id}")
-                ->select();
+            if ($_POST['end_time']) {
+                $belong_game = M("company_belong_game","tab_")
+                    ->where("((begin_time<={$time_start} and (end_time >={$time_start} or end_time=0)) or (begin_time<={$time_end} and end_time >={$time_end}) or (end_time>={$time_start} and end_time <={$time_end})) and id != {$id}")
+                    ->select();
+            } else {
+                $belong_game = M("company_belong_game","tab_")
+                    ->where("(begin_time>={$time_start} or (end_time >={$time_start})) and id != {$id}")
+                    ->select();
+            }
+
 
             if ($belong_game) {