From f33f1715293619eb14bbd87d6f7b0bfc48a5a4d8 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Wed, 26 Apr 2023 09:18:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/v1/setting/SystemCrud.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php
index 172b3eab9..48b1285d2 100644
--- a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php
+++ b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php
@@ -257,7 +257,7 @@ class SystemCrud extends AuthController
 
         //调整排序
         $makeData = [];
-        $names = ['model', 'dao', 'service', 'controller', 'validate', 'router', 'api', 'pages'];
+        $names = ['controller', 'service', 'dao', 'model', 'validate', 'router', 'api', 'pages'];
         foreach ($names as $name) {
             if (isset($data[$name])) {
                 $makeData[] = $data[$name];
@@ -571,6 +571,9 @@ class SystemCrud extends AuthController
             ]
         ];
         foreach ((array)$info->field['tableField'] as $item) {
+            if (isset($item['primaryKey']) && $item['primaryKey']) {
+                continue;
+            }
             if (isset($item['is_table']) && $item['is_table']) {
                 if (in_array($item['from_type'], ['frameImageOne', 'frameImages'])) {
                     $keyName = 'slot';