diff --git a/app/adminapi/validate/consult_basic/ConsultProjectValidate.php b/app/adminapi/validate/consult_basic/ConsultProjectValidate.php index 2608abd23..b0d8a6a26 100644 --- a/app/adminapi/validate/consult_basic/ConsultProjectValidate.php +++ b/app/adminapi/validate/consult_basic/ConsultProjectValidate.php @@ -212,13 +212,5 @@ class ConsultProjectValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/consult_build/ConsultAcceptValidate.php b/app/adminapi/validate/consult_build/ConsultAcceptValidate.php index 69035cf81..568a13471 100644 --- a/app/adminapi/validate/consult_build/ConsultAcceptValidate.php +++ b/app/adminapi/validate/consult_build/ConsultAcceptValidate.php @@ -132,22 +132,5 @@ class ConsultAcceptValidate extends BaseValidate } return true; } - - public function checkSubdirectory($value,$rule,$params): bool|string - { - $data = ConsultSubdirectory::where('id',$value)->where('directory_id',$params['directory_id'])->findOrEmpty(); - if($data->isEmpty()){ - return '子目录信息不存在'; - } - return true; - } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/consult_build/ConsultSceneExecuteValidate.php b/app/adminapi/validate/consult_build/ConsultSceneExecuteValidate.php index 3b6ffe3b5..1118f405c 100644 --- a/app/adminapi/validate/consult_build/ConsultSceneExecuteValidate.php +++ b/app/adminapi/validate/consult_build/ConsultSceneExecuteValidate.php @@ -142,12 +142,5 @@ class ConsultSceneExecuteValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/consult_build/ConsultSceneOrgValidate.php b/app/adminapi/validate/consult_build/ConsultSceneOrgValidate.php index 17ddb3fac..9e8a5678c 100644 --- a/app/adminapi/validate/consult_build/ConsultSceneOrgValidate.php +++ b/app/adminapi/validate/consult_build/ConsultSceneOrgValidate.php @@ -141,13 +141,5 @@ class ConsultSceneOrgValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/consult_build/ConsultScenePrepareValidate.php b/app/adminapi/validate/consult_build/ConsultScenePrepareValidate.php index 2f8b9bc0e..f0d195754 100644 --- a/app/adminapi/validate/consult_build/ConsultScenePrepareValidate.php +++ b/app/adminapi/validate/consult_build/ConsultScenePrepareValidate.php @@ -141,13 +141,5 @@ class ConsultScenePrepareValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/consult_strategy/ConsultContractValidate.php b/app/adminapi/validate/consult_strategy/ConsultContractValidate.php index e09f283a4..48d50414a 100644 --- a/app/adminapi/validate/consult_strategy/ConsultContractValidate.php +++ b/app/adminapi/validate/consult_strategy/ConsultContractValidate.php @@ -142,13 +142,5 @@ class ConsultContractValidate extends BaseValidate return true; } - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } - } \ No newline at end of file diff --git a/app/adminapi/validate/consult_strategy/ConsultCostValidate.php b/app/adminapi/validate/consult_strategy/ConsultCostValidate.php index 69ea76758..ea0bd40d1 100644 --- a/app/adminapi/validate/consult_strategy/ConsultCostValidate.php +++ b/app/adminapi/validate/consult_strategy/ConsultCostValidate.php @@ -141,13 +141,5 @@ class ConsultCostValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/consult_strategy/ConsultDeclareValidate.php b/app/adminapi/validate/consult_strategy/ConsultDeclareValidate.php index 9941d3be4..ca2130818 100644 --- a/app/adminapi/validate/consult_strategy/ConsultDeclareValidate.php +++ b/app/adminapi/validate/consult_strategy/ConsultDeclareValidate.php @@ -141,13 +141,5 @@ class ConsultDeclareValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/consult_strategy/ConsultDesignValidate.php b/app/adminapi/validate/consult_strategy/ConsultDesignValidate.php index c850bc2a4..ffab4a144 100644 --- a/app/adminapi/validate/consult_strategy/ConsultDesignValidate.php +++ b/app/adminapi/validate/consult_strategy/ConsultDesignValidate.php @@ -141,13 +141,5 @@ class ConsultDesignValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/consult_strategy/ConsultProcureValidate.php b/app/adminapi/validate/consult_strategy/ConsultProcureValidate.php index 7f2a77479..7a94747e9 100644 --- a/app/adminapi/validate/consult_strategy/ConsultProcureValidate.php +++ b/app/adminapi/validate/consult_strategy/ConsultProcureValidate.php @@ -141,13 +141,5 @@ class ConsultProcureValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/consult_target/ConsultControlValidate.php b/app/adminapi/validate/consult_target/ConsultControlValidate.php index 1130f834b..29c2bbf6e 100644 --- a/app/adminapi/validate/consult_target/ConsultControlValidate.php +++ b/app/adminapi/validate/consult_target/ConsultControlValidate.php @@ -141,13 +141,5 @@ class ConsultControlValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/consult_target/ConsultDecisionValidate.php b/app/adminapi/validate/consult_target/ConsultDecisionValidate.php index 69c52d6e2..36e667411 100644 --- a/app/adminapi/validate/consult_target/ConsultDecisionValidate.php +++ b/app/adminapi/validate/consult_target/ConsultDecisionValidate.php @@ -141,13 +141,5 @@ class ConsultDecisionValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/adminapi/validate/consult_target/ConsultDemandValidate.php b/app/adminapi/validate/consult_target/ConsultDemandValidate.php index 3fa7efbc3..1bf5109c1 100644 --- a/app/adminapi/validate/consult_target/ConsultDemandValidate.php +++ b/app/adminapi/validate/consult_target/ConsultDemandValidate.php @@ -141,13 +141,4 @@ class ConsultDemandValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } - } \ No newline at end of file diff --git a/app/adminapi/validate/consult_target/ConsultReceiveValidate.php b/app/adminapi/validate/consult_target/ConsultReceiveValidate.php index 17ba5c13e..b426d9795 100644 --- a/app/adminapi/validate/consult_target/ConsultReceiveValidate.php +++ b/app/adminapi/validate/consult_target/ConsultReceiveValidate.php @@ -141,13 +141,5 @@ class ConsultReceiveValidate extends BaseValidate } return true; } - - public function checkAnnex($value): bool|string - { - if(!empty($value) && $value != '' && !is_array($value)){ - return '附件格式错误'; - } - return true; - } } \ No newline at end of file diff --git a/app/common/model/BaseModel.php b/app/common/model/BaseModel.php index 7b8733e49..030cfcaf6 100755 --- a/app/common/model/BaseModel.php +++ b/app/common/model/BaseModel.php @@ -47,4 +47,8 @@ class BaseModel extends Model { return trim($value) ? FileService::setFileUrl($value) : ''; } + + public function getAnnexAttr($value){ + return !empty($value) ? json_decode($value,true) : ''; + } } \ No newline at end of file diff --git a/app/common/model/consult_basic/ConsultProject.php b/app/common/model/consult_basic/ConsultProject.php index 5d3119233..85701db6c 100644 --- a/app/common/model/consult_basic/ConsultProject.php +++ b/app/common/model/consult_basic/ConsultProject.php @@ -86,8 +86,4 @@ class ConsultProject extends BaseModel return !empty($value) ? date('Y-m-d', $value) : ''; } - public function getAnnexAttr($value) - { - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/consult_build/ConsultAccept.php b/app/common/model/consult_build/ConsultAccept.php index 3eba7de74..68836ef7c 100644 --- a/app/common/model/consult_build/ConsultAccept.php +++ b/app/common/model/consult_build/ConsultAccept.php @@ -29,8 +29,4 @@ class ConsultAccept extends BaseModel use SoftDelete; protected $name = 'consult_accept'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/consult_build/ConsultSceneExecute.php b/app/common/model/consult_build/ConsultSceneExecute.php index e34df5251..f984df531 100644 --- a/app/common/model/consult_build/ConsultSceneExecute.php +++ b/app/common/model/consult_build/ConsultSceneExecute.php @@ -30,7 +30,4 @@ class ConsultSceneExecute extends BaseModel protected $name = 'consult_scene_execute'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/consult_build/ConsultSceneOrg.php b/app/common/model/consult_build/ConsultSceneOrg.php index 3b3cef987..2c2c19579 100644 --- a/app/common/model/consult_build/ConsultSceneOrg.php +++ b/app/common/model/consult_build/ConsultSceneOrg.php @@ -29,8 +29,4 @@ class ConsultSceneOrg extends BaseModel use SoftDelete; protected $name = 'consult_scene_org'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/consult_build/ConsultScenePrepare.php b/app/common/model/consult_build/ConsultScenePrepare.php index cc2da8104..44b80e28d 100644 --- a/app/common/model/consult_build/ConsultScenePrepare.php +++ b/app/common/model/consult_build/ConsultScenePrepare.php @@ -30,7 +30,4 @@ class ConsultScenePrepare extends BaseModel protected $name = 'consult_scene_prepare'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/consult_strategy/ConsultContract.php b/app/common/model/consult_strategy/ConsultContract.php index f891d2e04..790a661e6 100644 --- a/app/common/model/consult_strategy/ConsultContract.php +++ b/app/common/model/consult_strategy/ConsultContract.php @@ -29,8 +29,4 @@ class ConsultContract extends BaseModel use SoftDelete; protected $name = 'consult_contract'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/consult_strategy/ConsultCost.php b/app/common/model/consult_strategy/ConsultCost.php index fa2df7473..32cc048da 100644 --- a/app/common/model/consult_strategy/ConsultCost.php +++ b/app/common/model/consult_strategy/ConsultCost.php @@ -29,8 +29,5 @@ class ConsultCost extends BaseModel use SoftDelete; protected $name = 'consult_cost'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } + } \ No newline at end of file diff --git a/app/common/model/consult_strategy/ConsultDeclare.php b/app/common/model/consult_strategy/ConsultDeclare.php index 79489327f..ff7312c37 100644 --- a/app/common/model/consult_strategy/ConsultDeclare.php +++ b/app/common/model/consult_strategy/ConsultDeclare.php @@ -29,8 +29,4 @@ class ConsultDeclare extends BaseModel use SoftDelete; protected $name = 'consult_declare'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/consult_strategy/ConsultDesign.php b/app/common/model/consult_strategy/ConsultDesign.php index 9daae775d..6d79614ed 100644 --- a/app/common/model/consult_strategy/ConsultDesign.php +++ b/app/common/model/consult_strategy/ConsultDesign.php @@ -30,8 +30,4 @@ class ConsultDesign extends BaseModel protected $name = 'consult_design'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/consult_strategy/ConsultProcure.php b/app/common/model/consult_strategy/ConsultProcure.php index 97654511b..0f782c16d 100644 --- a/app/common/model/consult_strategy/ConsultProcure.php +++ b/app/common/model/consult_strategy/ConsultProcure.php @@ -29,8 +29,4 @@ class ConsultProcure extends BaseModel use SoftDelete; protected $name = 'consult_procure'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/consult_target/ConsultControl.php b/app/common/model/consult_target/ConsultControl.php index 76abdd451..2b41820ed 100644 --- a/app/common/model/consult_target/ConsultControl.php +++ b/app/common/model/consult_target/ConsultControl.php @@ -29,8 +29,4 @@ class ConsultControl extends BaseModel use SoftDelete; protected $name = 'consult_control'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/consult_target/ConsultDecision.php b/app/common/model/consult_target/ConsultDecision.php index 9716dce74..81bc4860a 100644 --- a/app/common/model/consult_target/ConsultDecision.php +++ b/app/common/model/consult_target/ConsultDecision.php @@ -29,8 +29,4 @@ class ConsultDecision extends BaseModel use SoftDelete; protected $name = 'consult_decision'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/consult_target/ConsultDemand.php b/app/common/model/consult_target/ConsultDemand.php index 12d59ddbe..6d1ca1ddb 100644 --- a/app/common/model/consult_target/ConsultDemand.php +++ b/app/common/model/consult_target/ConsultDemand.php @@ -29,8 +29,4 @@ class ConsultDemand extends BaseModel use SoftDelete; protected $name = 'consult_demand'; protected $deleteTime = 'delete_time'; - - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/model/consult_target/ConsultReceive.php b/app/common/model/consult_target/ConsultReceive.php index b98b5ded7..ce7e20c4f 100644 --- a/app/common/model/consult_target/ConsultReceive.php +++ b/app/common/model/consult_target/ConsultReceive.php @@ -30,7 +30,4 @@ class ConsultReceive extends BaseModel protected $name = 'consult_receive'; protected $deleteTime = 'delete_time'; - public function getAnnexAttr($value){ - return !empty($value) ? json_decode($value,true) : ''; - } } \ No newline at end of file diff --git a/app/common/validate/BaseValidate.php b/app/common/validate/BaseValidate.php index 7dced897b..5524718aa 100755 --- a/app/common/validate/BaseValidate.php +++ b/app/common/validate/BaseValidate.php @@ -94,4 +94,12 @@ class BaseValidate extends Validate } return true; } + + public function checkAnnex($value): bool|string + { + if(!empty($value) && $value != '' && !is_array($value)){ + return '附件格式错误'; + } + return true; + } } \ No newline at end of file