From 3f6146a489571e35c0d5ef25b02b24252ee3da4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=BB=BA=E5=8D=8E?= <cumtsjh@163.com>
Date: Wed, 16 Oct 2019 14:45:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=85=E5=AE=B9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AE=BE=E7=BD=AE=E8=A1=A8=E5=8D=95=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E7=99=BD=E5=90=8D=E5=8D=95=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Admin/ContentController.php | 6 ++++--
 app/Repository/Admin/EntityFieldRepository.php   | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/ContentController.php b/app/Http/Controllers/Admin/ContentController.php
index 57a2cc9..589dc80 100644
--- a/app/Http/Controllers/Admin/ContentController.php
+++ b/app/Http/Controllers/Admin/ContentController.php
@@ -20,7 +20,7 @@ use Illuminate\View\View;
 
 class ContentController extends Controller
 {
-    protected $formNames = [];
+    protected $formNames = ['created_at', 'updated_at'];
 
     protected $entity = null;
 
@@ -64,6 +64,7 @@ class ContentController extends Controller
      * 内容列表数据接口
      *
      * @param Request $request
+     * @param integer $entity
      * @return array
      */
     public function list(Request $request, $entity)
@@ -74,6 +75,7 @@ class ContentController extends Controller
         }
 
         $perPage = (int) $request->get('limit', 50);
+        $this->formNames = array_merge($this->formNames, EntityFieldRepository::getFields($entity));
         $condition = $request->only($this->formNames);
 
         $data = ContentRepository::list($entity, $perPage, $condition);
@@ -116,7 +118,7 @@ class ContentController extends Controller
 
         try {
             ContentRepository::add($request->only(
-                EntityFieldRepository::getByEntityId($entity)->pluck('name')->toArray()
+                EntityFieldRepository::getFields($entity)
             ));
             return [
                 'code' => 0,
diff --git a/app/Repository/Admin/EntityFieldRepository.php b/app/Repository/Admin/EntityFieldRepository.php
index dcaf022..0863dd3 100644
--- a/app/Repository/Admin/EntityFieldRepository.php
+++ b/app/Repository/Admin/EntityFieldRepository.php
@@ -64,4 +64,10 @@ class EntityFieldRepository
         return  EntityField::query()->where('entity_id', $id)
             ->orderBy('order')->orderBy('is_show_inline')->get();
     }
+
+    public static function getFields($entityId)
+    {
+        return  EntityField::query()->select('name')->where('entity_id', $entityId)->get()
+            ->pluck('name')->toArray();
+    }
 }
-- 
GitLab