diff --git a/app/adminapi/controller/auth/AdminController.php b/app/adminapi/controller/auth/AdminController.php index 03eb537e2..db3f808a3 100755 --- a/app/adminapi/controller/auth/AdminController.php +++ b/app/adminapi/controller/auth/AdminController.php @@ -23,6 +23,7 @@ use think\exception\ValidateException; use think\facade\Db; use think\facade\Request; use app\api\logic\SmsLogic; +use app\api\controller\JunziqianController; /** * 管理员控制器 @@ -156,8 +157,8 @@ class AdminController extends BaseAdminController $result = AdminLogic::detail($params); if ($result && $result['contract'] && $result['contract']['file'] != '') { $data = [ - 'name' => $result['company_name'] . '合同', - 'signatories' => [['fullName' => $result['company_name'], 'identityType' => 1, 'identityCard' => $result['id_card'], 'mobile' => $result['account'], 'noNeedVerify' => 1, 'signLevel' => 1]], + 'name' => $result['name'] . '的个人合同', + 'signatories' => [['fullName' => $result['name'], 'identityType' => 1, 'identityCard' => $result['id_card'], 'mobile' => $result['account'], 'noNeedVerify' => 1, 'signLevel' => 1]], 'url' => $result['contract']['file'] ]; $res = app(JunziqianController::class)->Signing($data); @@ -165,7 +166,7 @@ class AdminController extends BaseAdminController Db::name('contract')->where('admin_id', $params['id'])->update(['contract_no' => $res->data]); $data = array( "applyNo" => $res->data, //TODO * - "fullName" => $result['company_name'], //TODO * + "fullName" => $result['name'], //TODO * "identityCard" => $result['id_card'], //TODO * "identityType" => 1, //TODO * ); @@ -177,7 +178,7 @@ class AdminController extends BaseAdminController 'mobile' => $result['phone'], 'name' => $result['name'], 'type' => '《' . $result['contract']['contract_type_name'] . '》', - 'code' => 'api/Hetong/url?id=' . $$result['contract']['id'], + 'code' => 'api/Hetong/url?id=' . $result['contract']['id'], 'scene' => 'WQ' ]; $result = SmsLogic::contractUrl($sms); diff --git a/app/adminapi/logic/auth/AdminLogic.php b/app/adminapi/logic/auth/AdminLogic.php index e2e93a2fc..818c5af40 100755 --- a/app/adminapi/logic/auth/AdminLogic.php +++ b/app/adminapi/logic/auth/AdminLogic.php @@ -222,9 +222,9 @@ class AdminLogic extends BaseLogic { $admin = Admin::field([ 'id', 'account', 'name', 'disable', 'root', - 'multipoint_login', 'avatar', 'sex', 'province', 'city', 'area', 'street', 'address', 'qualification', 'is_contract', 'id_card' + 'multipoint_login', 'avatar', 'sex', 'province', 'city', 'area', 'street', 'address', 'qualification', 'is_contract', 'id_card,phone' ])->findOrEmpty($params['id'])->toArray(); - $admin['qualification'] = json_decode($admin['qualification'], true); + $admin['qualification'] = $admin['qualification']!=null?json_decode($admin['qualification'], true):[]; $admin['contract']=Db::name('contract')->where('admin_id',$params['id']) ->withAttr('contract_type_name',function($value,$data){ return Db::name('dict_data')->where('id',$data['contract_type'])->value('name');