From f675357a2dd60aa37aac4a0dd119701b01fb33ab Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 31 Mar 2021 17:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E6=89=93=E6=AC=BE=E7=B3=BB?=
 =?UTF-8?q?=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 ++--
 Application/Admin/View/BusinessAffairsAward/lists.html        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/BusinessAffairsAwardController.class.php b/Application/Admin/Controller/BusinessAffairsAwardController.class.php
index 51ca65fbd..0f3f1af55 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) {
diff --git a/Application/Admin/View/BusinessAffairsAward/lists.html b/Application/Admin/View/BusinessAffairsAward/lists.html
index 9bf92cfd7..7adeb0499 100644
--- a/Application/Admin/View/BusinessAffairsAward/lists.html
+++ b/Application/Admin/View/BusinessAffairsAward/lists.html
@@ -90,9 +90,9 @@
                 <empty name ="list">
                 <td colspan="14" class="text-center">aOh! 暂时还没有内容!</td>
                 <else />
-                    <volist name="list" id="data">
+                    <volist name="list" id="data" key="index">
                         <tr>
-                            <td>{$data.id}</td>
+                            <td>{$index}</td>
                             <td>{$data.start_amount}-{$data.end_amount}</td>
                             <td>{$data.ratio}%</td>
                             <td>