From cab9c835883242d1f401a9c5c0e68851824acce6 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Fri, 21 Apr 2023 12:19:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php
index fe112999f..85bddd781 100644
--- a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php
+++ b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php
@@ -207,6 +207,7 @@ class SystemCrud extends AuthController
 
         $make = $this->services->makeFile($info->table_name, $routeName, false, [
             'menuName' => $info->name,
+            'modelName' => $info->model_name,
             'key' => $key,
             'softDelete' => $softDelete,
             'fromField' => $info->field['fromField'] ?? [],
diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php
index 3711ce6d0..8c2ff222d 100644
--- a/crmeb/app/services/system/SystemCrudServices.php
+++ b/crmeb/app/services/system/SystemCrudServices.php
@@ -530,7 +530,7 @@ class SystemCrudServices extends BaseServices
         $service->setFilePathName($filePath['service'] ?? '')->setbasePath($basePath)->handle($tableName, [
             'field' => $options['fromField'],
             'usePath' => $dao->getUsePath(),
-            'modelName' => $options['modelName'],
+            'modelName' => $options['modelName'] ?? '',
         ]);
         //生成验证器
         $validate = app()->make(Validate::class);