Update

app/Http/Controllers/AgriculturalBaseController.php

@@ -4,11 +4,11 @@ namespace App\Http\Controllers;
 
 use App\Enums\BaseType;
 use App\Helpers\Paginator;
-use Illuminate\Http\Request;
-use App\Models\AgriculturalBase;
-use Illuminate\Support\Facades\DB;
 use App\Http\Requestes\AgriculturalBaseRequest;
 use App\Http\Resources\AgriculturalBaseResource;
+use App\Models\AgriculturalBase;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class AgriculturalBaseController extends Controller
 {

app/Http/Controllers/CropController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers;
 
+use App\Http\Requestes\CropRequest;
+use App\Http\Resources\CropResource;
 use App\Models\Crop;
 use App\Models\CropYield;
 use Illuminate\Http\Request;
-use App\Http\Requestes\CropRequest;
-use App\Http\Resources\CropResource;
 
 class CropController extends Controller
 {

app/Http/Requestes/AgriculturalBaseRequest.php

@@ -3,10 +3,10 @@
 namespace App\Http\Requestes;
 
 use App\Enums\BaseType;
-use Illuminate\Validation\Rules\Enum;
-use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Exceptions\HttpResponseException;
+use Illuminate\Validation\Rules\Enum;
 
 class AgriculturalBaseRequest extends FormRequest
 {

app/Http/Requestes/CropRequest.php

@@ -36,7 +36,7 @@ class CropRequest extends FormRequest
             'is_end' => '请选择是否结点',
             'unit' => '请填写单位',
             'extends' => '请正确填写扩展字段',
-            'sort' => '请正确填写排序'
+            'sort' => '请正确填写排序',
         ];
 
         return $messages;

app/Http/Resources/AgriculturalBaseResource.php

@@ -3,7 +3,6 @@
 namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
-use Peidikeji\Keywords\Http\Resources\KeywordResource;
 
 class AgriculturalBaseResource extends JsonResource
 {

app/ModelFilters/AgriculturalBaseFilter.php

@@ -6,7 +6,8 @@ use EloquentFilter\ModelFilter;
 
 class AgriculturalBaseFilter extends ModelFilter
 {
-    public function type($type){
+    public function type($type)
+    {
         return $this->where('type', $type);
     }
 }

app/ModelFilters/CropFilter.php

@@ -15,7 +15,7 @@ class CropFilter extends ModelFilter
     {
         $q = $this;
         switch ($type) {
-            case "top":
+            case 'top':
                 $q->whereNull('parent_id');
                 break;
             case 'all':
@@ -23,6 +23,7 @@ class CropFilter extends ModelFilter
             default:
                 break;
         }
+
         return $q;
     }
 }

app/Models/AgriculturalBase.php

@@ -21,11 +21,13 @@ class AgriculturalBase extends Model
         'description', 'map', 'areas', 'workforce',
     ];
 
-    public function scopeBase($q){
+    public function scopeBase($q)
+    {
         return $q->where('type', BaseType::Base);
     }
 
-    public function scopeTown($q){
+    public function scopeTown($q)
+    {
         return $q->where('type', BaseType::Town);
     }
 

app/Models/Crop.php

@@ -9,7 +9,8 @@ class Crop extends Model
 {
     use Filterable;
 
-    public function scopeSort($q){
+    public function scopeSort($q)
+    {
         return $q->orderBy('sort', 'desc')->orderBy('created_at', 'desc');
     }
 
@@ -18,6 +19,6 @@ class Crop extends Model
         'name', 'parent_id',
         'path', 'is_end',
         'sort',
-        'extends'
+        'extends',
     ];
 }

app/Models/CropFlow.php

@@ -4,7 +4,6 @@ namespace App\Models;
 
 use EloquentFilter\Filterable;
 use Illuminate\Database\Eloquent\Model;
-use Peidikeji\Keywords\Models\Keywords;
 
 class CropFlow extends Model
 {

app/Models/CropYield.php

@@ -4,7 +4,6 @@ namespace App\Models;
 
 use EloquentFilter\Filterable;
 use Illuminate\Database\Eloquent\Model;
-use Peidikeji\Keywords\Models\Keywords;
 
 class CropYield extends Model
 {