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

Merge pull request '更新' (#19) from mkm into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/19
This commit is contained in:
mkm 2023-08-03 14:28:29 +08:00
commit 5abe528f30
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/common/logic/UserLogic.php
View File

@ -53,9 +53,9 @@ class UserLogic extends BaseLogic
$user['channel'] = UserTerminalEnum::getTermInalDesc($user['channel']); $user['channel'] = UserTerminalEnum::getTermInalDesc($user['channel']);
// $user->sex = $user->getData('sex'); // $user->sex = $user->getData('sex');
$user['qualification'] = json_decode($user->qualification, true); $user['qualification'] = json_decode($user->qualification, true);
if ($user->is_contract == 1) { // if ($user->is_contract == 1) {
$user['contract'] = Contract::where(['type' => 2, 'party_b' => $userId])->with(['partyA', 'contractType'])->find(); $user['contract'] = Contract::where(['type' => 2, 'party_b' => $userId])->with(['partyA', 'contractType'])->find();
} // }
return $user->toArray(); return $user->toArray();
} }