diff --git a/app/adminapi/validate/build/BuildProcessSettingsValidate.php b/app/adminapi/validate/build/BuildProcessSettingsValidate.php index 90e13bb4b..d8d6d37b6 100644 --- a/app/adminapi/validate/build/BuildProcessSettingsValidate.php +++ b/app/adminapi/validate/build/BuildProcessSettingsValidate.php @@ -124,9 +124,8 @@ class BuildProcessSettingsValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php b/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php index e49add287..d54d6eb06 100644 --- a/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php +++ b/app/adminapi/validate/project/ProjectAttendanceRecordValidate.php @@ -111,9 +111,8 @@ class ProjectAttendanceRecordValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/project/ProjectSettlementValidate.php b/app/adminapi/validate/project/ProjectSettlementValidate.php index 1b91e10c5..8337df4f9 100644 --- a/app/adminapi/validate/project/ProjectSettlementValidate.php +++ b/app/adminapi/validate/project/ProjectSettlementValidate.php @@ -41,7 +41,7 @@ class ProjectSettlementValidate extends BaseValidate 'settlement_amount_uppercase' => 'require', 'remaining_amount' => 'require|float|egt:0', 'settlement_date' => 'require|dateFormat:Y-m-d', - 'annex' => 'checkFile' + 'annex' => 'checkAnnex' ]; protected $message = [ @@ -129,11 +129,10 @@ class ProjectSettlementValidate extends BaseValidate return true; } - public function checkFile($value): bool|string + public function checkAnnex($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/quality/QualityAcceptValidate.php b/app/adminapi/validate/quality/QualityAcceptValidate.php index b7166d13f..329e797b8 100644 --- a/app/adminapi/validate/quality/QualityAcceptValidate.php +++ b/app/adminapi/validate/quality/QualityAcceptValidate.php @@ -128,9 +128,8 @@ class QualityAcceptValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/quality/QualityAccidentValidate.php b/app/adminapi/validate/quality/QualityAccidentValidate.php index ee586c82b..cd468f029 100644 --- a/app/adminapi/validate/quality/QualityAccidentValidate.php +++ b/app/adminapi/validate/quality/QualityAccidentValidate.php @@ -128,9 +128,8 @@ class QualityAccidentValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/quality/QualityDetectionTempValidate.php b/app/adminapi/validate/quality/QualityDetectionTempValidate.php index 205bcf0ea..09d6e0b52 100644 --- a/app/adminapi/validate/quality/QualityDetectionTempValidate.php +++ b/app/adminapi/validate/quality/QualityDetectionTempValidate.php @@ -117,9 +117,8 @@ class QualityDetectionTempValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/quality/QualityDetectionValidate.php b/app/adminapi/validate/quality/QualityDetectionValidate.php index 760656097..0ad9197be 100644 --- a/app/adminapi/validate/quality/QualityDetectionValidate.php +++ b/app/adminapi/validate/quality/QualityDetectionValidate.php @@ -118,9 +118,8 @@ class QualityDetectionValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/quality/QualityMboValidate.php b/app/adminapi/validate/quality/QualityMboValidate.php index 377f937c8..4931fc846 100644 --- a/app/adminapi/validate/quality/QualityMboValidate.php +++ b/app/adminapi/validate/quality/QualityMboValidate.php @@ -129,9 +129,8 @@ class QualityMboValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/quality/QualitySpecificationValidate.php b/app/adminapi/validate/quality/QualitySpecificationValidate.php index c842c20fc..d3955ea21 100644 --- a/app/adminapi/validate/quality/QualitySpecificationValidate.php +++ b/app/adminapi/validate/quality/QualitySpecificationValidate.php @@ -117,9 +117,8 @@ class QualitySpecificationValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/quality/QualitySuperviseValidate.php b/app/adminapi/validate/quality/QualitySuperviseValidate.php index de96c7951..fc33fcb80 100644 --- a/app/adminapi/validate/quality/QualitySuperviseValidate.php +++ b/app/adminapi/validate/quality/QualitySuperviseValidate.php @@ -128,9 +128,8 @@ class QualitySuperviseValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/safety/SafetyAccidentValidate.php b/app/adminapi/validate/safety/SafetyAccidentValidate.php index 1e8d18f09..30cc783e1 100644 --- a/app/adminapi/validate/safety/SafetyAccidentValidate.php +++ b/app/adminapi/validate/safety/SafetyAccidentValidate.php @@ -144,9 +144,8 @@ class SafetyAccidentValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/safety/SafetyCheckValidate.php b/app/adminapi/validate/safety/SafetyCheckValidate.php index 55c319078..473e15e43 100644 --- a/app/adminapi/validate/safety/SafetyCheckValidate.php +++ b/app/adminapi/validate/safety/SafetyCheckValidate.php @@ -127,9 +127,8 @@ class SafetyCheckValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/safety/SafetyEmergencyPlanValidate.php b/app/adminapi/validate/safety/SafetyEmergencyPlanValidate.php index 3faa507a9..cec9fa1af 100644 --- a/app/adminapi/validate/safety/SafetyEmergencyPlanValidate.php +++ b/app/adminapi/validate/safety/SafetyEmergencyPlanValidate.php @@ -140,9 +140,8 @@ class SafetyEmergencyPlanValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/safety/SafetyEvaluateValidate.php b/app/adminapi/validate/safety/SafetyEvaluateValidate.php index b2df40dcf..2ad307f24 100644 --- a/app/adminapi/validate/safety/SafetyEvaluateValidate.php +++ b/app/adminapi/validate/safety/SafetyEvaluateValidate.php @@ -143,9 +143,8 @@ class SafetyEvaluateValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/safety/SafetyEventValidate.php b/app/adminapi/validate/safety/SafetyEventValidate.php index c1bf6979c..76bbe62fc 100644 --- a/app/adminapi/validate/safety/SafetyEventValidate.php +++ b/app/adminapi/validate/safety/SafetyEventValidate.php @@ -144,9 +144,8 @@ class SafetyEventValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/safety/SafetyHazardValidate.php b/app/adminapi/validate/safety/SafetyHazardValidate.php index 738e4bf7d..154defe9b 100644 --- a/app/adminapi/validate/safety/SafetyHazardValidate.php +++ b/app/adminapi/validate/safety/SafetyHazardValidate.php @@ -126,9 +126,8 @@ class SafetyHazardValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/safety/SafetyProductMonthValidate.php b/app/adminapi/validate/safety/SafetyProductMonthValidate.php index 24218cc83..305e37e99 100644 --- a/app/adminapi/validate/safety/SafetyProductMonthValidate.php +++ b/app/adminapi/validate/safety/SafetyProductMonthValidate.php @@ -148,9 +148,8 @@ class SafetyProductMonthValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/safety/SafetyRehearsalValidate.php b/app/adminapi/validate/safety/SafetyRehearsalValidate.php index 40eb2fa1b..a7ee2aa18 100644 --- a/app/adminapi/validate/safety/SafetyRehearsalValidate.php +++ b/app/adminapi/validate/safety/SafetyRehearsalValidate.php @@ -143,9 +143,8 @@ class SafetyRehearsalValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/safety/SafetyStandardValidate.php b/app/adminapi/validate/safety/SafetyStandardValidate.php index 55712b1d4..1f8d27e89 100644 --- a/app/adminapi/validate/safety/SafetyStandardValidate.php +++ b/app/adminapi/validate/safety/SafetyStandardValidate.php @@ -134,9 +134,8 @@ class SafetyStandardValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/safety/SafetySuperviseValidate.php b/app/adminapi/validate/safety/SafetySuperviseValidate.php index eeb827afc..5d29a61b0 100644 --- a/app/adminapi/validate/safety/SafetySuperviseValidate.php +++ b/app/adminapi/validate/safety/SafetySuperviseValidate.php @@ -120,9 +120,8 @@ class SafetySuperviseValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } } diff --git a/app/adminapi/validate/safety/SafetyTargetValidate.php b/app/adminapi/validate/safety/SafetyTargetValidate.php index 4c6ca9458..6a2d0d327 100644 --- a/app/adminapi/validate/safety/SafetyTargetValidate.php +++ b/app/adminapi/validate/safety/SafetyTargetValidate.php @@ -143,9 +143,8 @@ class SafetyTargetValidate extends BaseValidate public function checkFile($value): bool|string { - if($value != ''){ - $file = $value;//json_decode($value,true); - if(empty($file)){ + if(!empty($value) && $value != ''){ + if(!is_array($value)){ return '附件必须是json数组'; } }