|
|
@@ -103,9 +103,31 @@ class SignContractController extends AdminController
|
|
|
foreach ($list as $key => $value) {
|
|
|
$value->{'contract_name'} = Contract::where('id',$value->{'contract_id'})->value('name');
|
|
|
//获取用户签署链接
|
|
|
- $value->{'psn_sign_url'} = SignRecord::where('sign_id',$value->{'id'})->where('authType','PSN')->value('sign_url');
|
|
|
+ $psnInfo = SignRecord::where('sign_id',$value->{'id'})->where('authType','PSN')->select(['status','sign_url','id_no'])->first();
|
|
|
+ if (!empty($psnInfo)){
|
|
|
+ $psnInfo->{'name'} = Member::where('psnId',$psnInfo->{'id_no'})->value('name');
|
|
|
+ }else{
|
|
|
+ $psnInfo = [
|
|
|
+ 'status' => 1,
|
|
|
+ 'sign_url' => '',
|
|
|
+ 'id_no' => '',
|
|
|
+ 'name' => '',
|
|
|
+ ];
|
|
|
+ }
|
|
|
//获取企业签署链接
|
|
|
- $value->{'org_sign_url'} = SignRecord::where('sign_id',$value->{'id'})->where('authType','ORG')->value('sign_url');
|
|
|
+ $orgInfo = SignRecord::where('sign_id',$value->{'id'})->where('authType','ORG')->select(['status','sign_url','id_no'])->first();
|
|
|
+ if (!empty($orgInfo)){
|
|
|
+ $orgInfo->{'name'} = Firm::where('orgId',$psnInfo->{'id_no'})->value('name');
|
|
|
+ }else{
|
|
|
+ $orgInfo = [
|
|
|
+ 'status' => 1,
|
|
|
+ 'sign_url' => '',
|
|
|
+ 'id_no' => '',
|
|
|
+ 'name' => '',
|
|
|
+ ];
|
|
|
+ }
|
|
|
+ $value->{'psnInfo'} = $psnInfo;
|
|
|
+ $value->{'orgInfo'} = $orgInfo;
|
|
|
$value->initializeModel();
|
|
|
}
|
|
|
|