From c33da0e8031121ffde7b1e651e2616ed89f73acd Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 23 Mar 2023 10:59:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=86=9C=E4=BD=9C=E7=89=A9?=
 =?UTF-8?q?=E7=88=B6=E7=BA=A7=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/CropController.php      | 8 ++++++--
 app/Http/Controllers/CropYieldController.php | 2 +-
 database/seeders/CropSeeder.php              | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/CropController.php b/app/Http/Controllers/CropController.php
index b2c0b74..a182c43 100644
--- a/app/Http/Controllers/CropController.php
+++ b/app/Http/Controllers/CropController.php
@@ -26,7 +26,9 @@ class CropController extends Controller
         //如果有上级，录入path
         if ($input['parent_id'] ?? 0) {
             $parent = Crop::findOrFail($input['parent_id']);
-            $input['path'] = ($parent?->path ?? '').$parent?->id.'-';
+            $input['path'] = ($parent?->path ?? '-').$parent?->id.'-';
+        }else{
+            $input['path'] = '-';
         }
         $crop = Crop::create($input);
 
@@ -56,7 +58,9 @@ class CropController extends Controller
         //如果有上级，录入path
         if ($input['parent_id'] ?? 0) {
             $parent = Crop::findOrFail($input['parent_id']);
-            $input['path'] = ($parent?->path ?? '').$parent?->id.'-';
+            $input['path'] = ($parent?->path ?? '-').$parent?->id.'-';
+        }else{
+            $input['path'] = '-';
         }
 
         $crop->update(array_merge($request->input(), $input));
diff --git a/app/Http/Controllers/CropYieldController.php b/app/Http/Controllers/CropYieldController.php
index eaab3da..0d1133c 100644
--- a/app/Http/Controllers/CropYieldController.php
+++ b/app/Http/Controllers/CropYieldController.php
@@ -186,7 +186,7 @@ class CropYieldController extends Controller
         } else {
             $cropQ = Crop::query();
             if ($crop) {
-                $cropQ->where('path', 'like', '%'.$crop->id.'-');
+                $cropQ->where('path', 'like', '%-'.$crop->id.'-');
             } else {
                 $cropQ->where('category_id', $categoryId);
             }
diff --git a/database/seeders/CropSeeder.php b/database/seeders/CropSeeder.php
index f9cc2b8..19cd718 100644
--- a/database/seeders/CropSeeder.php
+++ b/database/seeders/CropSeeder.php
@@ -170,7 +170,7 @@ class CropSeeder extends Seeder
                 'category_id' => $item['category_id'],
                 'crop_type' => $item['crop_type'],
                 'parent_id' => $parentCrop ? ($parentCrop?->id ?? 0) :0,
-                'path' => $parentCrop ? (($parentCrop?->path ?? '').$parentCrop->id.'-'):'',
+                'path' => $parentCrop ? (($parentCrop?->path ?? '-').$parentCrop->id.'-'):'-',
                 'unit' => $item['unit'],
                 'extends' => isset($item['extends']) ? json_encode($item['extends']) : null,
                 'is_end' => isset($item['children']) ? 0 : 1,