From 217fa10fd15ad00e7fb0cc6268106f417d5b6431 Mon Sep 17 00:00:00 2001
From: lwh <2679599887@qq.com>
Date: Thu, 27 Apr 2023 19:21:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E6=8B=9B=E7=94=9F?=
 =?UTF-8?q?=E7=AE=80=E4=BB=8B=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Enrol/EnrolIntro.php |  7 +++++--
 app/common/model/Enrol/EnrolIntro.php     | 23 +++++++++++++----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/admin/controller/Enrol/EnrolIntro.php b/app/admin/controller/Enrol/EnrolIntro.php
index bf48bec..11c0591 100644
--- a/app/admin/controller/Enrol/EnrolIntro.php
+++ b/app/admin/controller/Enrol/EnrolIntro.php
@@ -32,6 +32,7 @@ class EnrolIntro extends BaseController
                 'enrol_intro_id',
                 'enrol_intro_guid',
                 'enrol_intro_title',
+                'enrol_intro_sort',
                 'enrol_intro_content'
             ])
             ->order('enrol_intro_create_time', 'asc');
@@ -54,7 +55,8 @@ class EnrolIntro extends BaseController
         $model->allowField([
             'enrol_intro_update_user_guid',
             'enrol_intro_title',
-            'enrol_intro_content'
+            'enrol_intro_content',
+            'enrol_intro_sort'
         ])->save($params);
         return msg('编辑成功!');
     }
@@ -74,7 +76,8 @@ class EnrolIntro extends BaseController
             'enrol_intro_create_user_guid',
             'enrol_intro_update_user_guid',
             'enrol_intro_title',
-            'enrol_intro_content'
+            'enrol_intro_content',
+            'enrol_intro_sort'
         ]);
         return msg('添加成功!');
     }
diff --git a/app/common/model/Enrol/EnrolIntro.php b/app/common/model/Enrol/EnrolIntro.php
index 104f2e1..3719fb3 100644
--- a/app/common/model/Enrol/EnrolIntro.php
+++ b/app/common/model/Enrol/EnrolIntro.php
@@ -30,6 +30,8 @@ class EnrolIntro extends BaseModel
 
         "enrol_intro_content" => "string",
 
+        "enrol_intro_sort" => "int",
+
         "enrol_intro_create_time" => "datetime",
 
         "enrol_intro_create_user_guid" => "string",
@@ -54,13 +56,18 @@ class EnrolIntro extends BaseModel
 
 
 
+    //排序字段
+    public $order_field = 'enrol_intro_sort';
 
     /**
      * 新增前
      */
     public static function onBeforeInsert(self $model): void
     {
-        // self::checkRepeatData($model);
+        Tool::sortInsertProc(
+            self::class,
+            $model->enrol_intro_sort,
+        );
         $model->completeCreateField();
     }
 
@@ -69,15 +76,11 @@ class EnrolIntro extends BaseModel
      */
     public static function onBeforeUpdate(self $model): void
     {
-        // self::checkRepeatData($model);
+        Tool::sortEditProc(
+            self::class,
+            $model->enrol_intro_guid,
+            $model->enrol_intro_sort,
+        );
         $model->completeUpdateField();
     }
-
-    /**
-     * 删除前
-     */
-    public static function onBeforeDelete(self $model): void
-    {
-        $model->completeDeleteField();
-    }
 }