From 8982ebd74c0516d966f4e9bbe827d53a6f777378 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Sun, 23 Apr 2023 11:33:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/v1/setting/SystemCrud.php      | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php
index 71c7f677e..799e4361f 100644
--- a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php
+++ b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php
@@ -134,17 +134,7 @@ class SystemCrud extends AuthController
 
         $routeName = 'crud/' . Str::snake($tableName);
 
-        $make = $this->services->makeFile($tableName, $routeName, false, [
-            'menuName' => '',
-            'fromField' => [],
-            'columnField' => [],
-        ]);
-
-        $makePath = [];
-        foreach ($make as $key => $item) {
-            $makePath[$key] = $item['path'];
-        }
-
+        $key = 'id';
         $tableField = [];
         if ($isTable) {
             $field = $this->services->getColumnNamesList($tableName);
@@ -152,6 +142,9 @@ class SystemCrud extends AuthController
                 return app('json')->fail('表不存在');
             }
             foreach ($field as $item) {
+                if ($item['primaryKey']) {
+                    $key = $item['name'];
+                }
                 $tableField[] = [
                     'field' => $item['name'],
                     'field_type' => $item['type'],
@@ -167,6 +160,18 @@ class SystemCrud extends AuthController
             }
         }
 
+        $make = $this->services->makeFile($tableName, $routeName, false, [
+            'menuName' => '',
+            'key' => $key,
+            'fromField' => [],
+            'columnField' => [],
+        ]);
+
+        $makePath = [];
+        foreach ($make as $k => $item) {
+            $makePath[$k] = $item['path'];
+        }
+
         return app('json')->success(compact('makePath', 'tableField'));
     }