diff --git a/app/adminapi/logic/contract/ContractLogic.php b/app/adminapi/logic/contract/ContractLogic.php index bc1fd6bda..065261a06 100644 --- a/app/adminapi/logic/contract/ContractLogic.php +++ b/app/adminapi/logic/contract/ContractLogic.php @@ -116,15 +116,24 @@ class ContractLogic extends BaseLogic public static function detail($params): array { $data = Db::name('contract')->where('id', $params['id']) - ->withAttr('party_b_name', function ($value, $data) { + ->withAttr('party_b_info', function ($value, $data) { if ($data['type'] == 1) { - return Db::name('company')->where('id', $data['party_b'])->value('company_name'); + $filed=['id,company_name,organization_code,province,city,area,street,address,qualification']; + $company=Db::name('company')->where('id', $data['party_b'])->field($filed)->find(); + $company['qualification']=json_decode($company['qualification'],true); + return $company; } else { - return Db::name('admin')->where('id', $data['party_b'])->value('name'); + $filed=['id,nickname,mobile,province,city,area,street,address,qualification']; + $user= Db::name('user')->where('id', $data['party_b'])->field($filed)->find(); + $user['qualification']=json_decode($user['qualification'],true); + return $user; } }) - ->withAttr('party_a_name', function ($value, $data) { - return Db::name('company')->where('id', $data['party_a'])->value('company_name'); + ->withAttr('party_a_info', function ($value, $data) { + $filed=['id,company_name,organization_code,province,city,area,street,address,qualification']; + $company=Db::name('company')->where('id', $data['party_a'])->field($filed)->find(); + $company['qualification']=json_decode($company['qualification'],true); + return $company; }) ->withAttr('area_manager_name', function ($value, $data) { @@ -140,6 +149,7 @@ class ContractLogic extends BaseLogic return $data['status']==1?'已签约':'未签约'; }) ->find(); + return $data; } } diff --git a/app/api/controller/InformationController.php b/app/api/controller/InformationController.php index da585dba3..5cef866e8 100644 --- a/app/api/controller/InformationController.php +++ b/app/api/controller/InformationController.php @@ -33,12 +33,12 @@ class InformationController extends BaseApiController $user=User::where('id',$this->userId)->find(); $param['admin_id'] = $this->userId; $param['company_id']=$this->userInfo['company_id']; - $param['province']=$user['province']; - $param['city']=$user['city']; - $param['area']=$user['area']; - $param['street']=$user['street']; - $param['village']=$user['village']; - $param['brigade']=$user['brigade']; + $param['province_id']=$user['province']; + $param['city_id']=$user['city']; + $param['area_id']=$user['area']; + $param['street_id']=$user['street']; + $param['village_id']=$user['village']; + $param['brigade_id']=$user['brigade']; $res = UserInformationg::add($param); if ($res != true) { return $this->fail( BaseLogic::getError());