1
This commit is contained in:
@@ -54,9 +54,18 @@ class Ucenter extends Base{
|
||||
->join('t_user_reviewer_info','t_user.user_id = t_user_reviewer_info.reviewer_id','left')
|
||||
->where('t_user.user_id',$data['user_id'])
|
||||
->find();
|
||||
|
||||
//获取用户的领域
|
||||
$userInfo['baseInfo']['majorshu'] = $userInfo['baseInfo']['major']==0?'':getMajorShu($userInfo['baseInfo']['major']);
|
||||
$userInfo['baseInfo']['majorStr'] = $userInfo['baseInfo']['major']==0?'':getMajorStr($userInfo['baseInfo']['major']);
|
||||
$majors = $this->major_to_user_obj->where("user_id",$data['user_id'])->where("state",0)->select();
|
||||
foreach ($majors as $k => $v){
|
||||
$majors[$k]['shu'] = $this->getMajorShu($v['major_id']);
|
||||
$majors[$k]['str'] = $this->getMajorStr($v['major_id']);
|
||||
}
|
||||
$userInfo['baseInfo']['majors'] = $majors;
|
||||
|
||||
|
||||
|
||||
//cv信息
|
||||
$cvs = $this->user_cv_obj->where('user_id',$data['user_id'])->where('state',0)->select();
|
||||
$userInfo['cvs'] = $cvs;
|
||||
@@ -557,8 +566,8 @@ class Ucenter extends Base{
|
||||
if(!$rule->check($data)){
|
||||
return jsonError($rule->getError());
|
||||
}
|
||||
$major = $this->major_obj->where('major_id',$data['major_id'])->find();
|
||||
$major['children'] = $this->major_obj->where('pid',$major['major_id'])->select();
|
||||
$major = $this->major_obj->where('major_id',$data['major_id'])->where("major_state",0)->find();
|
||||
$major['children'] = $this->major_obj->where('pid',$major['major_id'])->where("major_state",0)->select();
|
||||
$re['major'] = $major;
|
||||
return jsonSuccess($re);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user