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 @@ aOh! 暂时还没有内容! - + - {$data.id} + {$index} {$data.start_amount}-{$data.end_amount} {$data.ratio}%