From 8e6768df5dbde14ded849f70fd15c96eac0af953 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 20 Jan 2024 11:01:00 +0800
Subject: [PATCH] update

---
 app/adminapi/logic/custom/CustomLogic.php       | 15 ++++++++++++---
 app/adminapi/validate/custom/CustomValidate.php |  4 +++-
 app/common/model/custom/Custom.php              |  8 ++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/adminapi/logic/custom/CustomLogic.php b/app/adminapi/logic/custom/CustomLogic.php
index 19a496e07..287c5bfd0 100644
--- a/app/adminapi/logic/custom/CustomLogic.php
+++ b/app/adminapi/logic/custom/CustomLogic.php
@@ -50,7 +50,6 @@ class CustomLogic extends BaseLogic
                 'dept_id' => $params['dept_id'],
                 'name' => $params['name'],
                 'custom_type' => $params['custom_type'],
-                'parent_company' => $params['parent_company'] ?? '',
                 'phone' => $params['phone'],
                 'credit_rating' => $params['credit_rating'],
                 'province' => $params['province'] ?? 0,
@@ -112,7 +111,6 @@ class CustomLogic extends BaseLogic
                 'dept_id' => $params['dept_id'],
                 'name' => $params['name'],
                 'custom_type' => $params['custom_type'],
-                'parent_company' => $params['parent_company'] ?? '',
                 'phone' => $params['phone'],
                 'credit_rating' => $params['credit_rating'],
                 'province' => $params['province'] ?? 0,
@@ -153,7 +151,18 @@ class CustomLogic extends BaseLogic
      */
     public static function delete(array $params): bool
     {
-        return Custom::destroy($params['id']);
+	    Db::startTrans();
+	    try {
+			$custom_contacts_ids = CustomContacts::where('custom_id',$params['id'])->column('id');
+		    Custom::destroy($params['id']);
+			CustomContacts::destroy($custom_contacts_ids);
+		    Db::commit();
+		    return true;
+	    } catch (\Exception $e) {
+		    Db::rollback();
+		    self::setError($e->getMessage());
+		    return false;
+	    }
     }
 
 
diff --git a/app/adminapi/validate/custom/CustomValidate.php b/app/adminapi/validate/custom/CustomValidate.php
index df7792a2f..44848c901 100644
--- a/app/adminapi/validate/custom/CustomValidate.php
+++ b/app/adminapi/validate/custom/CustomValidate.php
@@ -82,7 +82,9 @@ class CustomValidate extends BaseValidate
      * @date 2023/11/11 22:10
      */
     public function sceneEdit()
-    {}
+    {
+		return $this->remove('other_contacts',true);
+    }
 
 
     /**
diff --git a/app/common/model/custom/Custom.php b/app/common/model/custom/Custom.php
index ceb6169c4..d7db9cb4a 100644
--- a/app/common/model/custom/Custom.php
+++ b/app/common/model/custom/Custom.php
@@ -61,12 +61,12 @@ class Custom extends BaseModel
     }
 	
 	public function getCustomTypeTextAttr($value,$data){
-		$dictData = DictData::where('type_value','custom_type')->column('name','value');
-		return $dictData[$data['custom_type']];
+		$dict = DictData::where('type_value','custom_type')->column('name','value');
+		return !empty($data['custom_type']) ? $dict[$data['custom_type']] : '';
 	}
 	
 	public function getCreditRatingTextAttr($value,$data){
-		$dictData = DictData::where('type_value','credit_rating')->column('name','value');
-		return $dictData[$data['credit_rating']];
+		$dict = DictData::where('type_value','credit_rating')->column('name','value');
+		return !empty($data['credit_rating']) ? $dict[$data['credit_rating']] : '';
 	}
 }
\ No newline at end of file