From 135218ff545790259ac3754ef1bd4a2290bf6e0a Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 4 Jan 2023 15:41:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9F=BA=E5=9C=B0=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Requestes/AgriculturalBaseRequest.php     |  1 +
 app/Models/AgriculturalBase.php               |  3 +-
 ...2_add_sort_to_agricultural_bases_table.php | 34 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 database/migrations/2023_01_04_153712_add_sort_to_agricultural_bases_table.php

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 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('agricultural_bases', function (Blueprint $table) {
+            //
+            $table->unsignedInteger('sort')->default(0)->comment('排序');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('agricultural_bases', function (Blueprint $table) {
+            //
+            $table->dropColumn(['sort']);
+        });
+    }
+};