From 256e0bd0531972fe7f3ecbcfebc06a7a632c8c00 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 27 Jan 2024 17:21:24 +0800
Subject: [PATCH] fixed

---
 app/common/model/bid/BidBiddingDecision.php            |  4 ++--
 app/common/model/bid/BidResult.php                     |  2 +-
 app/common/model/build/BuildProcessSettings.php        |  2 +-
 app/common/model/build/BuildReport.php                 |  2 +-
 app/common/model/custom/CustomFollow.php               |  4 ++--
 app/common/model/custom/CustomerDemand.php             |  2 +-
 app/common/model/custom/CustomerDemandSolution.php     |  2 +-
 app/common/model/material/Material.php                 |  2 +-
 app/common/model/material/MaterialWarehouse.php        |  2 +-
 app/common/model/project/Competitor.php                |  2 +-
 app/common/model/project/Project.php                   |  2 +-
 app/common/model/project/ProjectAttendanceRecord.php   |  2 +-
 app/common/model/project/ProjectEstimate.php           |  4 ++--
 .../model/project/ProjectInsuranceManagement.php       |  2 +-
 app/common/model/project/ProjectManagerAppointment.php | 10 +++++-----
 app/common/model/project/ProjectMilestones.php         |  4 ++--
 app/common/model/project/ProjectPlan.php               | 10 +++++-----
 app/common/model/project/ProjectSalaryPayment.php      |  4 ++--
 app/common/model/project/ProjectSettlement.php         |  2 +-
 .../model/project/ProjectSubcontractSettlement.php     |  2 +-
 app/common/model/quality/QualityAccept.php             |  2 +-
 app/common/model/quality/QualityAccident.php           |  2 +-
 app/common/model/quality/QualityDetection.php          |  2 +-
 app/common/model/quality/QualityDetectionTemp.php      |  4 ++--
 app/common/model/quality/QualityEvent.php              |  2 +-
 app/common/model/quality/QualityMbo.php                |  2 +-
 app/common/model/quality/QualitySpecification.php      |  2 +-
 app/common/model/quality/QualitySupervise.php          |  2 +-
 app/common/model/safety/SafetyAccident.php             |  2 +-
 app/common/model/safety/SafetyCheck.php                |  2 +-
 app/common/model/safety/SafetyEmergencyPlan.php        |  2 +-
 app/common/model/safety/SafetyEvaluate.php             |  2 +-
 app/common/model/safety/SafetyEvent.php                |  2 +-
 app/common/model/safety/SafetyHazard.php               |  2 +-
 app/common/model/safety/SafetyProductMonth.php         |  2 +-
 app/common/model/safety/SafetyRehearsal.php            |  2 +-
 app/common/model/safety/SafetyStandard.php             |  2 +-
 app/common/model/safety/SafetySupervise.php            |  2 +-
 app/common/model/safety/SafetyTarget.php               |  2 +-
 app/common/model/supplier/Supplier.php                 | 10 +++++-----
 40 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/app/common/model/bid/BidBiddingDecision.php b/app/common/model/bid/BidBiddingDecision.php
index bcf8b8031..34fec61c6 100644
--- a/app/common/model/bid/BidBiddingDecision.php
+++ b/app/common/model/bid/BidBiddingDecision.php
@@ -60,7 +60,7 @@ class BidBiddingDecision extends BaseModel
 	
 	public function getProjectAssuranceTextAttr($value,$data){
 		$dictData = DictData::where('type_value','project_assurance')->column('name','value');
-		return $dictData[$data['project_assurance']];
+		return !empty($data['project_assurance']) ? $dictData[$data['project_assurance']] : '';
 	}
 	
 	public function getIsMarginTextAttr($value,$data): string
@@ -77,7 +77,7 @@ class BidBiddingDecision extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return empty($value) ? null : json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
     
 }
\ No newline at end of file
diff --git a/app/common/model/bid/BidResult.php b/app/common/model/bid/BidResult.php
index 905345b03..1abce8ebd 100644
--- a/app/common/model/bid/BidResult.php
+++ b/app/common/model/bid/BidResult.php
@@ -39,7 +39,7 @@ class BidResult extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return empty($value) ? null : json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
     
 }
\ No newline at end of file
diff --git a/app/common/model/build/BuildProcessSettings.php b/app/common/model/build/BuildProcessSettings.php
index 494d19698..8ff091d7b 100644
--- a/app/common/model/build/BuildProcessSettings.php
+++ b/app/common/model/build/BuildProcessSettings.php
@@ -32,6 +32,6 @@ class BuildProcessSettings extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/build/BuildReport.php b/app/common/model/build/BuildReport.php
index 839ad5e85..3e65e106f 100644
--- a/app/common/model/build/BuildReport.php
+++ b/app/common/model/build/BuildReport.php
@@ -32,6 +32,6 @@ class BuildReport extends BaseModel
 	
 	public function getSceneFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/custom/CustomFollow.php b/app/common/model/custom/CustomFollow.php
index c06405b1e..084fbc859 100644
--- a/app/common/model/custom/CustomFollow.php
+++ b/app/common/model/custom/CustomFollow.php
@@ -38,7 +38,7 @@ class CustomFollow extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return empty($value) ? null : json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 
     public function getNextFollowDateAttr($value): string
@@ -48,6 +48,6 @@ class CustomFollow extends BaseModel
 
     public function getTypesTextAttr($value,$data){
 		$dictData = DictData::where('type_value','custom_follow_type')->column('name','value');
-		return $dictData[$data['types']];
+		return !empty($data['types']) ? $dictData[$data['types']] : '';
     }
 }
\ No newline at end of file
diff --git a/app/common/model/custom/CustomerDemand.php b/app/common/model/custom/CustomerDemand.php
index a0c1ad3ff..f75d5708c 100644
--- a/app/common/model/custom/CustomerDemand.php
+++ b/app/common/model/custom/CustomerDemand.php
@@ -44,6 +44,6 @@ class CustomerDemand extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return empty($value) ? null : json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/custom/CustomerDemandSolution.php b/app/common/model/custom/CustomerDemandSolution.php
index 090971eb8..a13b3a4dd 100644
--- a/app/common/model/custom/CustomerDemandSolution.php
+++ b/app/common/model/custom/CustomerDemandSolution.php
@@ -32,7 +32,7 @@ class CustomerDemandSolution extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return empty($value) ? null : json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getSubmissionTimeAttr($value): string
diff --git a/app/common/model/material/Material.php b/app/common/model/material/Material.php
index e93ad7a4a..4b4bf3aad 100644
--- a/app/common/model/material/Material.php
+++ b/app/common/model/material/Material.php
@@ -32,6 +32,6 @@ class Material extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return empty($value) ? null : json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/material/MaterialWarehouse.php b/app/common/model/material/MaterialWarehouse.php
index 64dc6fd57..e6573c70b 100644
--- a/app/common/model/material/MaterialWarehouse.php
+++ b/app/common/model/material/MaterialWarehouse.php
@@ -32,7 +32,7 @@ class MaterialWarehouse extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return empty($value) ? null : json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getIsMrpTextAttr($value,$data): string
diff --git a/app/common/model/project/Competitor.php b/app/common/model/project/Competitor.php
index bed527706..bc39d0f62 100644
--- a/app/common/model/project/Competitor.php
+++ b/app/common/model/project/Competitor.php
@@ -32,6 +32,6 @@ class Competitor extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return empty($value) ? null : json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/project/Project.php b/app/common/model/project/Project.php
index 73404cf8c..9717d23ff 100644
--- a/app/common/model/project/Project.php
+++ b/app/common/model/project/Project.php
@@ -124,6 +124,6 @@ class Project extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return empty($value) ? null : json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/project/ProjectAttendanceRecord.php b/app/common/model/project/ProjectAttendanceRecord.php
index 44cb8d00b..7b099f1b6 100644
--- a/app/common/model/project/ProjectAttendanceRecord.php
+++ b/app/common/model/project/ProjectAttendanceRecord.php
@@ -32,7 +32,7 @@ class ProjectAttendanceRecord extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	public function getAttendanceDateAttr($value): string
 	{
diff --git a/app/common/model/project/ProjectEstimate.php b/app/common/model/project/ProjectEstimate.php
index e6499045e..7834223dd 100644
--- a/app/common/model/project/ProjectEstimate.php
+++ b/app/common/model/project/ProjectEstimate.php
@@ -34,7 +34,7 @@ class ProjectEstimate extends BaseModel
 	public function getEstimateSourceTextAttr($value,$data)
 	{
 		$dictData = DictData::where('type_value','estimate_source')->column('name','value');
-		return $dictData[$data['estimate_source']];
+		return !empty($data['estimate_source']) ? $dictData[$data['estimate_source']] : '';
 	}
 	public function getInvoiceTypeTextAttr($value,$data)
 	{
@@ -45,7 +45,7 @@ class ProjectEstimate extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return empty($value) ? null : json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getQuotationDateAttr($value): string
diff --git a/app/common/model/project/ProjectInsuranceManagement.php b/app/common/model/project/ProjectInsuranceManagement.php
index 76c55535c..77b22c5fb 100644
--- a/app/common/model/project/ProjectInsuranceManagement.php
+++ b/app/common/model/project/ProjectInsuranceManagement.php
@@ -32,7 +32,7 @@ class ProjectInsuranceManagement extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getInsuranceDateAttr($value): string
diff --git a/app/common/model/project/ProjectManagerAppointment.php b/app/common/model/project/ProjectManagerAppointment.php
index c46fb33d9..e8b2835f8 100644
--- a/app/common/model/project/ProjectManagerAppointment.php
+++ b/app/common/model/project/ProjectManagerAppointment.php
@@ -32,21 +32,21 @@ class ProjectManagerAppointment extends BaseModel
 	
 	public function getProjectApprovalDateAttr($value)
 	{
-		return date('Y-m-d',$value);
+		return !empty($value) ? date('Y-m-d',$value) : '';
 	}
 	
 	public function getStartDateAttr($value)
 	{
-		return date('Y-m-d',$value);
+		return !empty($value) ? date('Y-m-d',$value) : '';
 	}
 	
 	public function getDeliveryDateAttr($value)
 	{
-		return date('Y-m-d',$value);
+		return !empty($value) ? date('Y-m-d',$value) : '';
 	}
 	
-	public function getannexAttr($value)
+	public function getAnnexAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/project/ProjectMilestones.php b/app/common/model/project/ProjectMilestones.php
index a0bbe7358..51c66ef56 100644
--- a/app/common/model/project/ProjectMilestones.php
+++ b/app/common/model/project/ProjectMilestones.php
@@ -33,12 +33,12 @@ class ProjectMilestones extends BaseModel
 	
 	public function getProjectMilestonesDateAttr($value): string
 	{
-		return date('Y-m-d',$value);
+		return !empty($value) ? date('Y-m-d',$value) : '';
 	}
 	
 	public function getProjectMilestonesTextAttr($value,$data)
 	{
 		$dictDate = DictData::where('type_value','project_milestones')->column('name','value');
-		return $dictDate[$data['project_milestones']];
+		return !empty($data['project_milestones']) ? $dictDate[$data['project_milestones']] : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/project/ProjectPlan.php b/app/common/model/project/ProjectPlan.php
index e948dcd9c..a91a987da 100644
--- a/app/common/model/project/ProjectPlan.php
+++ b/app/common/model/project/ProjectPlan.php
@@ -32,21 +32,21 @@ class ProjectPlan extends BaseModel
 	
 	public function getStartTimeAttr($value)
 	{
-		return date('Y-m-d',$value);
+		return !empty($value) ? date('Y-m-d',$value) : '';
 	}
 	
 	public function getDeliverTimeAttr($value)
 	{
-		return date('Y-m-d',$value);
+		return !empty($value) ? date('Y-m-d',$value) : '';
 	}
 	
 	public function getDeclareTimeAttr($value)
 	{
-		return date('Y-m-d',$value);
+		return !empty($value) ? date('Y-m-d',$value) : '';
 	}
 	
-	public function getannexAttr($value)
+	public function getAnnexAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/project/ProjectSalaryPayment.php b/app/common/model/project/ProjectSalaryPayment.php
index c5c7c60e9..ba0303dfc 100644
--- a/app/common/model/project/ProjectSalaryPayment.php
+++ b/app/common/model/project/ProjectSalaryPayment.php
@@ -33,7 +33,7 @@ class ProjectSalaryPayment extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getApplyDateAttr($value): string
@@ -44,6 +44,6 @@ class ProjectSalaryPayment extends BaseModel
 	public function getPaymentTypeAttr($value,$data): string
 	{
 		$dictData = DictData::where('type_value','salary_payment_type')->column('name','value');
-		return $dictData[$data['payment_type']];
+		return !empty($data['payment_type']) ? $dictData[$data['payment_type']] : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/project/ProjectSettlement.php b/app/common/model/project/ProjectSettlement.php
index 83d22f47d..deb7dae1d 100644
--- a/app/common/model/project/ProjectSettlement.php
+++ b/app/common/model/project/ProjectSettlement.php
@@ -32,7 +32,7 @@ class ProjectSettlement extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getSettlementDateAttr($value): string
diff --git a/app/common/model/project/ProjectSubcontractSettlement.php b/app/common/model/project/ProjectSubcontractSettlement.php
index 913921435..62bbcc7ed 100644
--- a/app/common/model/project/ProjectSubcontractSettlement.php
+++ b/app/common/model/project/ProjectSubcontractSettlement.php
@@ -32,7 +32,7 @@ class ProjectSubcontractSettlement extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getSettlementDateAttr($value): string
diff --git a/app/common/model/quality/QualityAccept.php b/app/common/model/quality/QualityAccept.php
index bcf8da8d3..ff2856398 100644
--- a/app/common/model/quality/QualityAccept.php
+++ b/app/common/model/quality/QualityAccept.php
@@ -32,7 +32,7 @@ class QualityAccept extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getAcceptDateAttr($value): string
diff --git a/app/common/model/quality/QualityAccident.php b/app/common/model/quality/QualityAccident.php
index 5ec4ccf02..160dbd007 100644
--- a/app/common/model/quality/QualityAccident.php
+++ b/app/common/model/quality/QualityAccident.php
@@ -32,7 +32,7 @@ class QualityAccident extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getHappenDateAttr($value): string
diff --git a/app/common/model/quality/QualityDetection.php b/app/common/model/quality/QualityDetection.php
index eae1188d6..6be37499d 100644
--- a/app/common/model/quality/QualityDetection.php
+++ b/app/common/model/quality/QualityDetection.php
@@ -32,7 +32,7 @@ class QualityDetection extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getScheduledStartTimeAttr($value): string
diff --git a/app/common/model/quality/QualityDetectionTemp.php b/app/common/model/quality/QualityDetectionTemp.php
index b234e837f..3b8e7fe5c 100644
--- a/app/common/model/quality/QualityDetectionTemp.php
+++ b/app/common/model/quality/QualityDetectionTemp.php
@@ -33,11 +33,11 @@ class QualityDetectionTemp extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getNodeTextAttr($value,$data) {
 		$dictData = DictData::where('type_value','quality_detection_node')->column('name','value');
-		return $dictData[$data['node']];
+		return !empty($data['node']) ? $dictData[$data['node']] : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/quality/QualityEvent.php b/app/common/model/quality/QualityEvent.php
index 8a98355e6..c4e00d4f2 100644
--- a/app/common/model/quality/QualityEvent.php
+++ b/app/common/model/quality/QualityEvent.php
@@ -32,7 +32,7 @@ class QualityEvent extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getHappenDateAttr($value): string
diff --git a/app/common/model/quality/QualityMbo.php b/app/common/model/quality/QualityMbo.php
index 65b354626..cde0658b5 100644
--- a/app/common/model/quality/QualityMbo.php
+++ b/app/common/model/quality/QualityMbo.php
@@ -32,6 +32,6 @@ class QualityMbo extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/quality/QualitySpecification.php b/app/common/model/quality/QualitySpecification.php
index 386189052..d8df04de8 100644
--- a/app/common/model/quality/QualitySpecification.php
+++ b/app/common/model/quality/QualitySpecification.php
@@ -37,6 +37,6 @@ class QualitySpecification extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/quality/QualitySupervise.php b/app/common/model/quality/QualitySupervise.php
index 51df3a710..77d62741b 100644
--- a/app/common/model/quality/QualitySupervise.php
+++ b/app/common/model/quality/QualitySupervise.php
@@ -32,7 +32,7 @@ class QualitySupervise extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getHappenDateAttr($value): string
diff --git a/app/common/model/safety/SafetyAccident.php b/app/common/model/safety/SafetyAccident.php
index fa22d7d2f..67c76f99f 100644
--- a/app/common/model/safety/SafetyAccident.php
+++ b/app/common/model/safety/SafetyAccident.php
@@ -32,7 +32,7 @@ class SafetyAccident extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getHappenTimeAttr($value): string
diff --git a/app/common/model/safety/SafetyCheck.php b/app/common/model/safety/SafetyCheck.php
index f7be1b8c9..ed69653ff 100644
--- a/app/common/model/safety/SafetyCheck.php
+++ b/app/common/model/safety/SafetyCheck.php
@@ -32,7 +32,7 @@ class SafetyCheck extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getCheckDateAttr($value): string
diff --git a/app/common/model/safety/SafetyEmergencyPlan.php b/app/common/model/safety/SafetyEmergencyPlan.php
index 3f58a271f..8d256f2c8 100644
--- a/app/common/model/safety/SafetyEmergencyPlan.php
+++ b/app/common/model/safety/SafetyEmergencyPlan.php
@@ -32,7 +32,7 @@ class SafetyEmergencyPlan extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getHappenDateAttr($value): string
diff --git a/app/common/model/safety/SafetyEvaluate.php b/app/common/model/safety/SafetyEvaluate.php
index 7aa212d2d..f61d5860a 100644
--- a/app/common/model/safety/SafetyEvaluate.php
+++ b/app/common/model/safety/SafetyEvaluate.php
@@ -32,7 +32,7 @@ class SafetyEvaluate extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getHappenDateAttr($value): string
diff --git a/app/common/model/safety/SafetyEvent.php b/app/common/model/safety/SafetyEvent.php
index d7436a933..396e76693 100644
--- a/app/common/model/safety/SafetyEvent.php
+++ b/app/common/model/safety/SafetyEvent.php
@@ -32,7 +32,7 @@ class SafetyEvent extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getHappenTimeAttr($value): string
diff --git a/app/common/model/safety/SafetyHazard.php b/app/common/model/safety/SafetyHazard.php
index cf9bd0673..2fc0e49f1 100644
--- a/app/common/model/safety/SafetyHazard.php
+++ b/app/common/model/safety/SafetyHazard.php
@@ -32,6 +32,6 @@ class SafetyHazard extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/safety/SafetyProductMonth.php b/app/common/model/safety/SafetyProductMonth.php
index de39214a7..9a376cd3c 100644
--- a/app/common/model/safety/SafetyProductMonth.php
+++ b/app/common/model/safety/SafetyProductMonth.php
@@ -32,6 +32,6 @@ class SafetyProductMonth extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/safety/SafetyRehearsal.php b/app/common/model/safety/SafetyRehearsal.php
index 06946ff0c..7d1aab1e3 100644
--- a/app/common/model/safety/SafetyRehearsal.php
+++ b/app/common/model/safety/SafetyRehearsal.php
@@ -32,7 +32,7 @@ class SafetyRehearsal extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getHappenDateAttr($value): string
diff --git a/app/common/model/safety/SafetyStandard.php b/app/common/model/safety/SafetyStandard.php
index 49959ac40..4f23e361b 100644
--- a/app/common/model/safety/SafetyStandard.php
+++ b/app/common/model/safety/SafetyStandard.php
@@ -32,6 +32,6 @@ class SafetyStandard extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/safety/SafetySupervise.php b/app/common/model/safety/SafetySupervise.php
index 76fce1c39..84bcc7c49 100644
--- a/app/common/model/safety/SafetySupervise.php
+++ b/app/common/model/safety/SafetySupervise.php
@@ -32,7 +32,7 @@ class SafetySupervise extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getHappenTimeAttr($value): string
diff --git a/app/common/model/safety/SafetyTarget.php b/app/common/model/safety/SafetyTarget.php
index cd99568f4..31e65f846 100644
--- a/app/common/model/safety/SafetyTarget.php
+++ b/app/common/model/safety/SafetyTarget.php
@@ -32,6 +32,6 @@ class SafetyTarget extends BaseModel
 	
 	public function getFileAttr($value)
 	{
-		return json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 }
\ No newline at end of file
diff --git a/app/common/model/supplier/Supplier.php b/app/common/model/supplier/Supplier.php
index ee38cebab..3f9e73bf7 100644
--- a/app/common/model/supplier/Supplier.php
+++ b/app/common/model/supplier/Supplier.php
@@ -33,12 +33,12 @@ class Supplier extends BaseModel
 	
 	public function getAnnexAttr($value)
 	{
-		return empty($value) ? null : json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getSupplierPhotosAttr($value)
 	{
-		return empty($value) ? null : json_decode($value,true);
+		return !empty($value) ? json_decode($value,true) : '';
 	}
 	
 	public function getBirthdayAttr($value): string
@@ -56,19 +56,19 @@ class Supplier extends BaseModel
 	public function getSupplierGroupTextAttr($value,$data): string
 	{
 		$dict = DictData::where('type_value','supplier_group')->column('name','value');
-		return $dict[$data['supplier_group']];
+		return !empty($data['supplier_group']) ? $dict[$data['supplier_group']] : '';
 	}
 	
 	public function getSupplierCategoryTextAttr($value,$data): string
 	{
 		$dict = DictData::where('type_value','supplier_category')->column('name','value');
-		return $dict[$data['supplier_category']];
+		return !empty($data['supplier_category']) ? $dict[$data['supplier_category']] : '';
 	}
 	
 	public function getSupplierGradeTextAttr($value,$data): string
 	{
 		$dict = DictData::where('type_value','supplier_grade')->column('name','value');
-		return $dict[$data['supplier_grade']];
+		return !empty($data['supplier_grade']) ? $dict[$data['supplier_grade']] : '';
 	}
 	
 }
\ No newline at end of file