diff --git a/app/adminapi/logic/user/UserLogic.php b/app/adminapi/logic/user/UserLogic.php index 543fdac10..ad4890590 100755 --- a/app/adminapi/logic/user/UserLogic.php +++ b/app/adminapi/logic/user/UserLogic.php @@ -17,6 +17,7 @@ use app\common\enum\user\AccountLogEnum; use app\common\enum\user\UserTerminalEnum; use app\common\logic\AccountLogLogic; use app\common\logic\BaseLogic; +use app\common\model\contract\Contract; use app\common\model\user\User; use think\facade\Db; @@ -47,8 +48,11 @@ class UserLogic extends BaseLogic ->findOrEmpty(); $user['channel'] = UserTerminalEnum::getTermInalDesc($user['channel']); - $user->sex = $user->getData('sex'); + // $user->sex = $user->getData('sex'); $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(); } diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php index 1ae60b3b1..fca1757bb 100755 --- a/app/common/model/user/User.php +++ b/app/common/model/user/User.php @@ -132,10 +132,10 @@ class User extends BaseModel * @author 段誉 * @date 2022/9/7 15:15 */ - public function getSexAttr($value, $data) - { - return UserEnum::getSexDesc($value); - } + // public function getSexAttr($value, $data) + // { + // return UserEnum::getSexDesc($value); + // } /** diff --git a/vendor/ebaoquan/junziqian_sdk b/vendor/ebaoquan/junziqian_sdk index 9acc82cd2..1294ea49f 160000 --- a/vendor/ebaoquan/junziqian_sdk +++ b/vendor/ebaoquan/junziqian_sdk @@ -1 +1 @@ -Subproject commit 9acc82cd23d807280ddd29df2117e7890094d049 +Subproject commit 1294ea49ff9ecc4532821f8798304816cbf8dd74