From 9fda964fc586b1641839eedb6f57a087f7e4a4c3 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 13 Jan 2024 17:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/logic/custom/CustomContactsLogic.php       | 2 +-
 app/adminapi/validate/custom/CustomContactsValidate.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/adminapi/logic/custom/CustomContactsLogic.php b/app/adminapi/logic/custom/CustomContactsLogic.php
index 42b29a493..99cf9d277 100644
--- a/app/adminapi/logic/custom/CustomContactsLogic.php
+++ b/app/adminapi/logic/custom/CustomContactsLogic.php
@@ -49,7 +49,7 @@ class CustomContactsLogic extends BaseLogic
                 'telephone' => $params['telephone'] ?? '',
                 'email' => $params['email'] ?? '',
                 'notes' => $params['notes'] ?? '',
-                'annex' => $params['annex'] ?? null,
+                'annex' => $params['annex'] ?json_encode($params['annex']):'',
             ]);
             Db::commit();
             return true;
diff --git a/app/adminapi/validate/custom/CustomContactsValidate.php b/app/adminapi/validate/custom/CustomContactsValidate.php
index ca96d92cc..240f9ac45 100644
--- a/app/adminapi/validate/custom/CustomContactsValidate.php
+++ b/app/adminapi/validate/custom/CustomContactsValidate.php
@@ -107,11 +107,11 @@ class CustomContactsValidate extends BaseValidate
 	
 	public function checkAnnex($value): bool|string
 	{
-		if(!empty($value) && $value != ''){
-			$annex = json_decode($value,true);
-			if(empty($annex) || !is_array($annex)){
+		if(!empty($value) && !is_array($value)){
+			// $annex = json_decode($value,true);
+			// if(empty($annex) || !is_array($annex)){
 				return '附件数据格式错误';
-			}
+			// }
 		}
 		return true;
 	}