From eda3c9bbe4ec841ad9e366373434e3ecb71ce6d5 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 31 Mar 2021 17:29:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E6=89=93=E6=AC=BE?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9Fbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/BusinessAffairsAwardController.class.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/BusinessAffairsAwardController.class.php b/Application/Admin/Controller/BusinessAffairsAwardController.class.php
index 4fc9a1804..1b749cc05 100644
--- a/Application/Admin/Controller/BusinessAffairsAwardController.class.php
+++ b/Application/Admin/Controller/BusinessAffairsAwardController.class.php
@@ -30,7 +30,7 @@ class BusinessAffairsAwardController extends ThinkController
 
         foreach ($data as $key => $value) {
 
-            if(!$value['end_amount'] == '0') {
+            if($value['end_amount'] == '0') {
                 $data[$key]['end_amount'] = '永久';
             }
 

From cddf09db6070e53a1b63f6a0d45bf15761791417 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 31 Mar 2021 17:33:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E6=89=93=E6=AC=BE?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9Fbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Application/Admin/Controller/BusinessAffairsAwardController.class.php b/Application/Admin/Controller/BusinessAffairsAwardController.class.php
index 1b749cc05..51ca65fbd 100644
--- a/Application/Admin/Controller/BusinessAffairsAwardController.class.php
+++ b/Application/Admin/Controller/BusinessAffairsAwardController.class.php
@@ -70,7 +70,7 @@ class BusinessAffairsAwardController extends ThinkController
             $amount_end = $_POST['end_amount'];
 
             $busunessData = M("business_affairs_award", "tab_")
-                ->where("((start_amount<{$amount_start} and (end_amount >={$amount_start} or end_amount=0)) or (start_amount<{$amount_end} and (end_amount >={$amount_end} or end_amount=0)) or ((end_amount>={$amount_start} or end_amount=0) and (end_amount <={$amount_end} and end_amount!=0)))")
+                ->where("((start_amount<{$amount_start} and (end_amount >{$amount_start} or end_amount=0)) or (start_amount<{$amount_end} and (end_amount >={$amount_end} or end_amount=0)) or ((end_amount>={$amount_start} or end_amount=0) and (end_amount <={$amount_end} and end_amount!=0)))")
                 ->select();
 
             if ($busunessData) {
@@ -110,7 +110,7 @@ class BusinessAffairsAwardController extends ThinkController
             $amount_end = $_POST['end_amount'];
 
             $busunessData = M("business_affairs_award", "tab_")
-                ->where("id != {$id} and ((start_amount<{$amount_start} and (end_amount >={$amount_start} or end_amount=0)) or (start_amount<{$amount_end} and (end_amount >={$amount_end} or end_amount=0)) or ((end_amount>={$amount_start} or end_amount=0) and (end_amount <={$amount_end} and end_amount!=0)))")
+                ->where("id != {$id} and ((start_amount<{$amount_start} and (end_amount >{$amount_start} or end_amount=0)) or (start_amount<{$amount_end} and (end_amount >={$amount_end} or end_amount=0)) or ((end_amount>={$amount_start} or end_amount=0) and (end_amount <={$amount_end} and end_amount!=0)))")
                 ->select();
 
             if ($busunessData) {