From 0dcccba2a865670ef0a6d112650462aa42ea20fb Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 16 Aug 2023 15:54:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/TaskController.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index a4e7b8a6a..f13b74129 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -38,17 +38,18 @@ class TaskController extends BaseApiController{
         ->field(['id', 'title','money','template_id','director_uid', 'company_id',  'start_time', 'end_time', 'director_uid', 'type', 'status', 'content','extend'])
         ->page($page,25)
         ->order(['id' => 'desc','status'=>'asc'])
-        ->select()->each(function($item){
-            if($item->type==33){
+        ->select()->toArray();
+        foreach($res as $k=>$item){
+            if($item['type']==33){
                 $company = Company::where('id', $item['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足
-                $res=App(RemoteController::class)->shang_date_total_price($company);
-                if($res!=false){
-                    $item->extend['transaction']=$res;
+                $find=App(RemoteController::class)->shang_date_total_price($company);
+                if($find!=false){
+                    $res[$k]['extend']['transaction']=$find;
                 }else{
-                    $item->extend['transaction']='';
+                    $res[$k]['extend']['transaction']='';
                 }
             }
-        })->toArray();
+        }
         return $this->success('ok', $res);
     }
 }
\ No newline at end of file