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
app
adminapi/logic/user
common/model/user
vendor/ebaoquan

@ -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();
}

@ -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);
// }
/**

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