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-01 11:02:40 +08:00
parent 1f89a88631
commit 25c3aff88c
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/adminapi/logic/user/UserLogic.php
View File

@ -17,6 +17,7 @@ use app\common\enum\user\AccountLogEnum;
use app\common\enum\user\UserTerminalEnum; use app\common\enum\user\UserTerminalEnum;
use app\common\logic\AccountLogLogic; use app\common\logic\AccountLogLogic;
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use app\common\model\contract\Contract;
use app\common\model\user\User; use app\common\model\user\User;
use think\facade\Db; use think\facade\Db;
@ -47,8 +48,11 @@ class UserLogic extends BaseLogic
->findOrEmpty(); ->findOrEmpty();
$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){
$user['contract']=Contract::where(['type'=>2,'party_b'=>$user['id']])->with('party_a')->find();
}
return $user->toArray(); return $user->toArray();
} }

8
app/common/model/user/User.php
View File

@ -132,10 +132,10 @@ class User extends BaseModel
* @author 段誉 * @author 段誉
* @date 2022/9/7 15:15 * @date 2022/9/7 15:15
*/ */
public function getSexAttr($value, $data) // public function getSexAttr($value, $data)
{ // {
return UserEnum::getSexDesc($value); // return UserEnum::getSexDesc($value);
} // }
/** /**

2
vendor/ebaoquan/junziqian_sdk vendored

@ -1 +1 @@
Subproject commit 9acc82cd23d807280ddd29df2117e7890094d049 Subproject commit 1294ea49ff9ecc4532821f8798304816cbf8dd74