diff --git a/app/Http/Requestes/AgriculturalBaseRequest.php b/app/Http/Requestes/AgriculturalBaseRequest.php index 783eb60..eaa6386 100644 --- a/app/Http/Requestes/AgriculturalBaseRequest.php +++ b/app/Http/Requestes/AgriculturalBaseRequest.php @@ -29,6 +29,7 @@ class AgriculturalBaseRequest extends FormRequest 'address_lat' => 'nullable|regex:/^\d+(\.\d{1,10})?$/', 'address_lng' => 'nullable|regex:/^\d+(\.\d{1,10})?$/', 'parent_id' => 'required_if:type,1|integer|min:0', + 'sort' => 'nullable|integer|min:0', ]; } diff --git a/app/Models/AgriculturalBase.php b/app/Models/AgriculturalBase.php index 8ef63b9..5f90e43 100644 --- a/app/Models/AgriculturalBase.php +++ b/app/Models/AgriculturalBase.php @@ -20,6 +20,7 @@ class AgriculturalBase extends Model 'name', 'person', 'address', 'address_lat', 'address_lng', 'description', 'map', 'areas', 'workforce', 'parent_id', 'cultivated', + 'sort', ]; public function parent(){ @@ -38,7 +39,7 @@ class AgriculturalBase extends Model public function scopeSort($q) { - return $q->orderBy('created_at', 'desc'); + return $q->orderBy('sort', 'desc')->orderBy('created_at', 'desc'); } public function crops() diff --git a/database/migrations/2023_01_04_153712_add_sort_to_agricultural_bases_table.php b/database/migrations/2023_01_04_153712_add_sort_to_agricultural_bases_table.php new file mode 100644 index 0000000..206ed10 --- /dev/null +++ b/database/migrations/2023_01_04_153712_add_sort_to_agricultural_bases_table.php @@ -0,0 +1,34 @@ +unsignedInteger('sort')->default(0)->comment('排序'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('agricultural_bases', function (Blueprint $table) { + // + $table->dropColumn(['sort']); + }); + } +};