From e37103f8f3d8e81ce54a1d6e5ab0ddd872ebc49c Mon Sep 17 00:00:00 2001
From: Simon <1095568674@qq.com>
Date: Thu, 29 Feb 2024 19:41:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=9D=83=E9=87=8D=E4=BC=A0=E5=80=BC=E4=B8=8D=E7=94=9F?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/command/Crud/stubs/mixins/modelinit.stub | 6 ++++--
 application/admin/model/UserRule.php                       | 6 ++++--
 application/common/model/Category.php                      | 4 +++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/application/admin/command/Crud/stubs/mixins/modelinit.stub b/application/admin/command/Crud/stubs/mixins/modelinit.stub
index 329fb95c5..0a1c93b89 100644
--- a/application/admin/command/Crud/stubs/mixins/modelinit.stub
+++ b/application/admin/command/Crud/stubs/mixins/modelinit.stub
@@ -2,7 +2,9 @@
     protected static function init()
     {
         self::afterInsert(function ($row) {
-            $pk = $row->getPk();
-            $row->getQuery()->where($pk, $row[$pk])->update(['{%order%}' => $row[$pk]]);
+            if (!$row['{%order%}']) {
+                $pk = $row->getPk();
+                $row->getQuery()->where($pk, $row[$pk])->update(['{%order%}' => $row[$pk]]);
+            }
         });
     }
diff --git a/application/admin/model/UserRule.php b/application/admin/model/UserRule.php
index 37ac709d0..86bb9fd47 100644
--- a/application/admin/model/UserRule.php
+++ b/application/admin/model/UserRule.php
@@ -23,8 +23,10 @@ class UserRule extends Model
     protected static function init()
     {
         self::afterInsert(function ($row) {
-            $pk = $row->getPk();
-            $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]);
+            if (!$row['weigh']) {
+                $pk = $row->getPk();
+                $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]);
+            }
         });
     }
 
diff --git a/application/common/model/Category.php b/application/common/model/Category.php
index d9c4f54b9..8b4669a82 100644
--- a/application/common/model/Category.php
+++ b/application/common/model/Category.php
@@ -24,7 +24,9 @@ class Category extends Model
     protected static function init()
     {
         self::afterInsert(function ($row) {
-            $row->save(['weigh' => $row['id']]);
+            if (!$row['weigh']) {
+                $row->save(['weigh' => $row['id']]);
+            }
         });
     }
 
-- 
Gitee