mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-08-07 15:31:59 +08:00
parent e07a1e0436
commit d4fe5e76a5
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/logic/informationg/UserInformationgLogic.php
View File

@ -149,6 +149,8 @@ class UserInformationgLogic extends BaseLogic
'id' => $v['id'],
'category_id' => $v['category_id'],
'category_child' => $v['category_child'],
'create_time' => $v['create_time'],
'update_time' => $v['update_time'],
'datas' => $a
];
if ($a) {

3
app/api/controller/CompanyController.php
View File

@ -59,6 +59,9 @@ class CompanyController extends BaseApiController
$company = $query->append(['province_name', 'city_name', 'area_name', 'street_name', 'area_manager_name'])->toArray();
$company['other_contacts'] = json_decode($company['other_contacts'], true);
$company['qualification'] = $company['qualification'] != null ? json_decode($company['qualification'], true) : '';
if($company['qualification'] && isset($company['qualification']['other_qualifications'])){
$company['qualification']['other_qualifications']=json_decode($company['qualification']['other_qualifications'],true);
}
$contract = Contract::where('party_b',$id)->find();
if (!empty($contract)) {
if ($contract['type'] == 2) {