fixed

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) : '';
 	}
     
 }

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) : '';
 	}
     
 }

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) : '';
 	}
 }

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) : '';
 	}
 }

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']] : '';
     }
 }

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) : '';
 	}
 }

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

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) : '';
 	}
 }

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

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) : '';
 	}
 }

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) : '';
 	}
 }

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
 	{

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

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

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) : '';
 	}
 }

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']] : '';
 	}
 }

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) : '';
 	}
 }

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']] : '';
 	}
 }

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

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

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

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

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

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']] : '';
 	}
 }

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

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) : '';
 	}
 }

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) : '';
 	}
 }

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

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

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

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

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

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

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) : '';
 	}
 }

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) : '';
 	}
 }

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

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) : '';
 	}
 }

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

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) : '';
 	}
 }

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']] : '';
 	}
 	
 }