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

Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem

Browse Source
This commit is contained in:
luofei 2023-07-21 14:40:46 +08:00
commit 65270d8964
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/adminapi/logic/CompanyLogic.php
View File

@ -62,7 +62,7 @@ class CompanyLogic extends BaseLogic
'master_phone' => $params['master_phone'],
'master_email' => $params['master_email'],
'other_contacts' => $params['other_contacts'],
// 'area_manager' => $params['area_manager'],
'area_manager' => $params['area_manager'],
// 'is_contract' => $params['is_contract'],
// 'account' => $params['account'],
// 'password' => $params['password'],
@ -111,7 +111,7 @@ class CompanyLogic extends BaseLogic
'master_phone' => $params['master_phone'],
'master_email' => $params['master_email'],
'other_contacts' => $params['other_contacts'],
// 'area_manager' => $params['area_manager'],
'area_manager' => $params['area_manager'],
// 'is_contract' => $params['is_contract'],
// 'account' => $params['account'],
// 'password' => $params['password'],
@ -122,7 +122,9 @@ class CompanyLogic extends BaseLogic
'level_one' => $params['contract']['party_a'] ?? 0,
// 'status' => $params['status']
]);
self::contract($params['id'], $params);
if($params['contract']){
self::contract($params['id'], $params);
}
Db::commit();
return true;
} catch (\Exception $e) {
@ -160,13 +162,12 @@ class CompanyLogic extends BaseLogic
if($data){
$data['other_contacts']=json_decode($data['other_contacts'],true);
$data['qualification']=json_decode($data['qualification'],true);
$data['admin_name']=Db::name('admin')->where('id',$data['admin_id'])->value('name');
$data['area_manager_name']=Db::name('admin')->where('id',$data['area_manager'])->value('name');
$data['contract']=Db::name('contract')->where('party_b',$data['id'])
->withAttr('party_a_name',function($value,$data){
return Db::name('company')->where('id',$data['party_a'])->value('company_name');
})
// ->withAttr('contract_file_url',function($value,$data){
// return Db::name('dict_data')->where('id',$data['contract_type_two'])->value('value');
// })
->find();
}
return $data;

4
app/adminapi/logic/auth/AdminLogic.php
View File

@ -360,8 +360,8 @@ class AdminLogic extends BaseLogic
$model->type = 2;
}
$model->update_time = time();
// $model->setAttrs($data);
$model->strict(false)->save($data);
$model->setAttrs($data);
$model->save($data);
}
}