From 4cc816b2cfd12dfe5b7ab90f13ac9241244b5311 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Wed, 26 Apr 2023 09:10:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=94=AE=E4=B8=8D?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminapi/controller/v1/setting/SystemCrud.php    | 12 +++++++-----
 crmeb/app/services/system/SystemCrudServices.php     |  2 --
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php
index db72e4f58..172b3eab9 100644
--- a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php
+++ b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php
@@ -88,11 +88,13 @@ class SystemCrud extends AuthController
             }
             //收集列表展示数据
             if ($item['is_table'] && !in_array($item['field_type'], ['primaryKey', 'addSoftDelete', 'addSoftDelete'])) {
-                $columnField[] = [
-                    'field' => $item['field'],
-                    'name' => $item['table_name'],
-                    'type' => $item['from_type'],
-                ];
+                if (isset($item['primaryKey']) && !$item['primaryKey']) {
+                    $columnField[] = [
+                        'field' => $item['field'],
+                        'name' => $item['table_name'],
+                        'type' => $item['from_type'],
+                    ];
+                }
             }
             //收集表单展示数据
             if ($item['from_type']) {
diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php
index 9ef6baeef..888792843 100644
--- a/crmeb/app/services/system/SystemCrudServices.php
+++ b/crmeb/app/services/system/SystemCrudServices.php
@@ -700,8 +700,6 @@ class SystemCrudServices extends BaseServices
                 $res = $this->dao->save($crudDate);
             }
 
-//            throw new ValidateException('测试中');
-
             return $res;
         });