Merge pull request '财务打款系统bug修复' (#259) from feature/add_item into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/259

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) {

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>