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

Merge pull request '修复字段' (#4) from mkm into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/4
This commit is contained in:
mkm 2023-08-02 11:39:29 +08:00
commit 4bc389d838
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ class CompanyController extends BaseApiController
$count = $query->count();
$users = $query->page($page)->limit($limit)->with(['company' => function ($query) {
$query->field('id,company_name');
}])->append(['province_name', 'city_name', 'area_name', 'street_name'])->field('id,avatar,real_name,account,mobile as phone,province,city,area,street,company_id,qualification,nickname,is_contract')->select()->each(function($item,$key){
}])->append(['province_name', 'city_name', 'area_name', 'street_name'])->field('id,avatar,real_name,account,mobile as phone,province,city,area,street,company_id,qualification,nickname,is_contract,is_captain')->select()->each(function($item,$key){
if($item['qualification']!=''){
$item['qualification']=json_decode($item['qualification'],true);
}
@ -101,7 +101,7 @@ class CompanyController extends BaseApiController
$query = User::where('id', $id);
$user = $query->with(['company' => function ($query) {
$query->field('id,company_name');
}])->append(['province_name', 'city_name', 'area_name', 'street_name'])->field('id,sex,avatar,nickname name,account,mobile phone,id_card,qualification,province,city,area,street,is_contract,company_id')->find()->toArray();
}])->append(['province_name', 'city_name', 'area_name', 'street_name'])->field('id,sex,avatar,nickname name,account,mobile phone,id_card,qualification,province,city,area,street,is_contract,company_id,is_captain')->find()->toArray();
$contract = Contract::whereRaw("(type=1 and party_b={$user['company_id']}) or (type=2 and party_b={$user['id']})")->append(['contract_type_name'])->find();
$user['contract'] = $contract;
// $roleIds = AdminRole::where('admin_id', $user['id'])->column('role_id');