From 6303fa6294c6595ed3031c77c95a819202bb5915 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 24 Aug 2023 12:07:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/informationg/UserInformationgLists.php | 1 +
 app/api/controller/RemoteController.php                   | 6 +++---
 app/api/controller/TaskController.php                     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/adminapi/lists/informationg/UserInformationgLists.php b/app/adminapi/lists/informationg/UserInformationgLists.php
index ddf2a3347..6b98316ac 100644
--- a/app/adminapi/lists/informationg/UserInformationgLists.php
+++ b/app/adminapi/lists/informationg/UserInformationgLists.php
@@ -58,6 +58,7 @@ class UserInformationgLists extends BaseAdminDataLists implements ListsSearchInt
             ->field(['id','create_user_id','company_id','area_id','area_id area_name','street_id','street_id street_name','village_id','village_id village_name', 'brigade_id','brigade_id brigade_name', 'address', 'name', 'phone', 'sex', 'age','update_time','create_time','status'])
             ->append(['extend'])
             ->order(['id' => 'desc'])
+            ->limit($this->limitOffset, $this->limitLength)
             ->select()
             ->toArray();
         return $lists;
diff --git a/app/api/controller/RemoteController.php b/app/api/controller/RemoteController.php
index e31255b95..91d17cff1 100644
--- a/app/api/controller/RemoteController.php
+++ b/app/api/controller/RemoteController.php
@@ -110,9 +110,9 @@ class RemoteController extends BaseApiController
             $time=strtotime($start_time)+86399;
             $end_time=date('Y-m-d H:i:s',$time);
         }
-        if(isset($arr['start_time']) && $arr['end_time']){
-            $start_time = $arr['start_time'];
-            $end_time = $arr['end_time'];
+        if(isset($querys['start_time']) && isset($querys['end_time'])){
+            $start_time = $querys['start_time'];
+            $end_time = $querys['end_time'];
 
         }
         $parmas = [
diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index 20ac2e8f3..6217a13a4 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -73,8 +73,8 @@ class TaskController extends BaseApiController
         }
         $company = Company::where('id', $task['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足
         $find = App(RemoteController::class)->shang_date_total_price($company);
-        $parmas['start_time']=$company['start_time'];
-        $parmas['end_time']=$company['end_time'];
+        $parmas['start_time']=date('Y-m-d',$task['start_time']);
+        $parmas['end_time']=$task['end_time'].' 23:59:59';
         $list = App(RemoteController::class)->shang_date_list($company, 1, $parmas);
         if ($find != false) {
             $find['list'] = $list;