From 32f91bf2b3249365fb52268ae31acc17dbf433f0 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Fri, 8 Dec 2023 17:20:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=A2=E6=88=B7=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/custom/CustomContactsLists.php        | 4 ++--
 app/adminapi/lists/custom_service/CustomServiceLists.php | 4 ++--
 app/adminapi/logic/custom/CustomContactsLogic.php        | 2 --
 app/adminapi/logic/custom_service/CustomServiceLogic.php | 6 ++----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/adminapi/lists/custom/CustomContactsLists.php b/app/adminapi/lists/custom/CustomContactsLists.php
index 777d64756..f49f0e0cb 100644
--- a/app/adminapi/lists/custom/CustomContactsLists.php
+++ b/app/adminapi/lists/custom/CustomContactsLists.php
@@ -38,7 +38,7 @@ class CustomContactsLists extends BaseAdminDataLists implements ListsSearchInter
     public function setSearch(): array
     {
         return [
-            '=' => ['custom_id', 'name', 'position', 'phone', 'telephone', 'email', 'notes', 'annex', 'status'],
+            '=' => ['custom_id', 'name', 'position', 'phone', 'telephone', 'email', 'notes', 'annex'],
         ];
     }
 
@@ -55,7 +55,7 @@ class CustomContactsLists extends BaseAdminDataLists implements ListsSearchInter
     public function lists(): array
     {
         return CustomContacts::where($this->searchWhere)
-            ->field(['id', 'custom_id', 'name', 'position', 'phone', 'telephone', 'email', 'notes', 'annex', 'status'])
+            ->field(['id', 'custom_id', 'name', 'position', 'phone', 'telephone', 'email', 'notes', 'annex'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
diff --git a/app/adminapi/lists/custom_service/CustomServiceLists.php b/app/adminapi/lists/custom_service/CustomServiceLists.php
index 61baa8f4d..f8c7e830a 100644
--- a/app/adminapi/lists/custom_service/CustomServiceLists.php
+++ b/app/adminapi/lists/custom_service/CustomServiceLists.php
@@ -38,7 +38,7 @@ class CustomServiceLists extends BaseAdminDataLists implements ListsSearchInterf
     public function setSearch(): array
     {
         return [
-            '=' => ['project_id', 'custom_id', 'approve_id', 'contacts', 'phone', 'date', 'classification', 'urgency', 'receiver', 'processed_admin_id', 'name', 'description', 'notes', 'annex', 'status'],
+            '=' => ['project_id', 'custom_id', 'approve_id', 'contacts', 'phone', 'date', 'classification', 'urgency', 'receiver', 'processed_admin_id', 'name', 'description', 'notes', 'annex'],
         ];
     }
 
@@ -55,7 +55,7 @@ class CustomServiceLists extends BaseAdminDataLists implements ListsSearchInterf
     public function lists(): array
     {
         return CustomService::where($this->searchWhere)
-            ->field(['id', 'project_id', 'custom_id', 'approve_id', 'contacts', 'phone', 'date', 'classification', 'urgency', 'receiver', 'processed_admin_id', 'name', 'description', 'notes', 'annex', 'status'])
+            ->field(['id', 'project_id', 'custom_id', 'approve_id', 'contacts', 'phone', 'date', 'classification', 'urgency', 'receiver', 'processed_admin_id', 'name', 'description', 'notes', 'annex'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
diff --git a/app/adminapi/logic/custom/CustomContactsLogic.php b/app/adminapi/logic/custom/CustomContactsLogic.php
index 91781dd99..ab972ee3d 100644
--- a/app/adminapi/logic/custom/CustomContactsLogic.php
+++ b/app/adminapi/logic/custom/CustomContactsLogic.php
@@ -49,7 +49,6 @@ class CustomContactsLogic extends BaseLogic
                 'email' => $params['email'],
                 'notes' => $params['notes'],
                 'annex' => $params['annex'],
-                'status' => $params['status']
             ]);
 
             Db::commit();
@@ -82,7 +81,6 @@ class CustomContactsLogic extends BaseLogic
                 'email' => $params['email'],
                 'notes' => $params['notes'],
                 'annex' => $params['annex'],
-                'status' => $params['status']
             ]);
 
             Db::commit();
diff --git a/app/adminapi/logic/custom_service/CustomServiceLogic.php b/app/adminapi/logic/custom_service/CustomServiceLogic.php
index 5cc22fb2a..6202f0756 100644
--- a/app/adminapi/logic/custom_service/CustomServiceLogic.php
+++ b/app/adminapi/logic/custom_service/CustomServiceLogic.php
@@ -54,8 +54,7 @@ class CustomServiceLogic extends BaseLogic
                 'name' => $params['name'],
                 'description' => $params['description'],
                 'notes' => $params['notes'],
-                'annex' => $params['annex'],
-                'status' => $params['status']
+                'annex' => $params['annex']
             ]);
 
             Db::commit();
@@ -93,8 +92,7 @@ class CustomServiceLogic extends BaseLogic
                 'name' => $params['name'],
                 'description' => $params['description'],
                 'notes' => $params['notes'],
-                'annex' => $params['annex'],
-                'status' => $params['status']
+                'annex' => $params['annex']
             ]);
 
             Db::commit();