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

调整后台用户信息返回

Browse Source
This commit is contained in:
luofei 2023-07-21 14:40:39 +08:00
parent 97b418b3fd
commit c95b98d5af
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,9 +215,11 @@ class AdminLogic extends BaseLogic
public static function detail($params, $action = 'detail'): array
{
$admin = Admin::field([
'id', 'account', 'name', 'disable', 'root',
'id', 'account', 'name', 'disable', 'root', 'company_id',
'multipoint_login', 'avatar', 'sex', 'province', 'city', 'area', 'street', 'address', 'qualification', 'is_contract', 'id_card,phone'
])->findOrEmpty($params['id'])->toArray();
])->with(['company' => function ($query) {
$query->field('id,company_name');
}])->findOrEmpty($params['id'])->toArray();
$admin['qualification'] = $admin['qualification']!=null?json_decode($admin['qualification'], true):[];
$admin['contract']=Db::name('contract')->where('party_b',$params['id'])
->withAttr('contract_type_name',function($value,$data){

6
app/common/model/auth/Admin.php
View File

@ -16,6 +16,7 @@ namespace app\common\model\auth;
use app\common\enum\YesNoEnum;
use app\common\model\BaseModel;
use app\common\model\Company;
use app\common\model\dept\Dept;
use think\model\concern\SoftDelete;
use app\common\service\FileService;
@ -113,4 +114,9 @@ class Admin extends BaseModel
return empty($value) ? FileService::getFileUrl(config('project.default_image.admin_avatar')) : FileService::getFileUrl(trim($value, '/'));
}
public function company()
{
return $this->hasOne(Company::class, 'id', 'company_id');
}
}