From e9eb3f238aca26045823492329fc1a50c08f2b96 Mon Sep 17 00:00:00 2001
From: "LAPTOP-7SGDREK0\\shiweijun" <411582373@qq.com>
Date: Mon, 17 Feb 2025 18:01:03 +0800
Subject: [PATCH] feat:dish

---
 app/Service/Admin/Material/DishService.php | 4 +++-
 app/Service/Api/Material/DishService.php   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Service/Admin/Material/DishService.php b/app/Service/Admin/Material/DishService.php
index a5b7a4a..6582db3 100644
--- a/app/Service/Admin/Material/DishService.php
+++ b/app/Service/Admin/Material/DishService.php
@@ -37,6 +37,7 @@ class DishService extends BaseService
         $chefId = (int)$this->request->input('query_chef_id',0);
 
         $list = $this->DishModel
+            ->leftJoin('cycle','dish.cycle_id','=','cycle.id')
             ->where('is_del',DishCode::IS_NO_DEL)
             ->when($id > 0, function ($query) use ($id) {
                 $query->where('id', $id);
@@ -56,7 +57,8 @@ class DishService extends BaseService
             ->when($chefId, function ($query) use ($chefId) {
                 $query->where('chef_id', $chefId);
             })
-            ->paginate($limit)->toArray();
+            ->orderBy('cycle.dates','desc')
+            ->paginate($limit,['dish.*','cycle.dates'])->toArray();
 
         return $this->return->success('success',$list);
     }
diff --git a/app/Service/Api/Material/DishService.php b/app/Service/Api/Material/DishService.php
index 2d929aa..c698307 100644
--- a/app/Service/Api/Material/DishService.php
+++ b/app/Service/Api/Material/DishService.php
@@ -119,8 +119,10 @@ class DishService extends BaseService
         $limit = (int)$this->request->input('limit');
         $chef_id = $this->userId;
         $list = $this->DishModel
+            ->leftJoin('cycle','dish.cycle_id','=','cycle.id')
             ->where('chef_id', $chef_id)
-            ->paginate($limit)->toArray();
+            ->orderBy('cycle.dates','desc')
+            ->paginate($limit,['dish.*','cycle.dates'])->toArray();
 
         return $this->return->success('success',$list);
     }