diff --git a/application/adminapi/controller/Statistical.php b/application/adminapi/controller/Statistical.php
index dac07415..1e62a403 100644
--- a/application/adminapi/controller/Statistical.php
+++ b/application/adminapi/controller/Statistical.php
@@ -522,28 +522,35 @@ class Statistical extends adminApi
         $search_user_id = 0;
         $search_gift_bag_id = 0;
         if($search_id){
-            $search_user_id= db::name('user')->where('user_code', $search_id)->value('id');
             $where['b.user_code'] = $search_id;
         }
         if($search_name){
             $where['b.nickname'] = ['like', '%'.$search_name.'%'];
-            $search_user_id= db::name('user')->where('nickname', $search_name)->value('id');
         }
         if($search_task_id){
             $where['a.task_id'] = $search_task_id;
-            $search_gift_bag_id = db::name('vs_tasks')->where('id', $search_task_id)->value('tasks_bag_id');
         }
         if($search_task_name){
             $where['c.task_name'] = ['like', '%'.$search_task_name.'%'];
-            $search_gift_bag_id = db::name('vs_tasks')->where('task_name', $search_task_name)->value('tasks_bag_id');
         }
-        if($begin_time !== ''){
-            $where['a.collection_time'] = ['>=', strtotime($begin_time)];
+        if(!empty($begin_time) && !empty($end_time)){
+            $where['a.collection_time'] = ['between', [strtotime($begin_time), strtotime($end_time)]];
+        }else{
+            if(!empty($begin_time)){
+                $where['a.collection_time'] = ['>=', strtotime($begin_time)];
+            }elseif(!empty($end_time)){
+                $where['a.collection_time'] = ['<=', strtotime($end_time)];
+            }
         }
-        if($end_time !== ''){
-            $where['a.collection_time'] = ['<=', strtotime($end_time)];
+        if(!empty($begin_time) && !empty($end_time)){
+            $where['a.createtime'] = ['between', [strtotime($begin_time), strtotime($end_time)]];
+        }else{
+            if(!empty($begin_time)){
+                $where['a.createtime'] = ['>=', strtotime($begin_time)];
+            }elseif(!empty($end_time)){
+                $where['a.createtime'] = ['<=', strtotime($end_time)];
+            }
         }
-
         // 添加条件：只统计已领取的任务奖励
 //        $where['a.is_claimed'] = 1;