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

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

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'] = '永久';
             }
 
@@ -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) {