|
@@ -67,6 +67,7 @@ class User extends UserModel
|
|
|
// 用户基本信息
|
|
// 用户基本信息
|
|
|
$userInfo = self::detail($userId);
|
|
$userInfo = self::detail($userId);
|
|
|
$userInfo['info']=$userInfo['info']? $userInfo['info'] : [];
|
|
$userInfo['info']=$userInfo['info']? $userInfo['info'] : [];
|
|
|
|
|
+ $userInfo['info']['school']=$userInfo['info']['school']? $userInfo['info']['school'] : [];
|
|
|
if (empty($userInfo) || $userInfo['is_delete']) {
|
|
if (empty($userInfo) || $userInfo['is_delete']) {
|
|
|
throwError('很抱歉,用户信息不存在或已删除', config('status.not_logged'));
|
|
throwError('很抱歉,用户信息不存在或已删除', config('status.not_logged'));
|
|
|
}
|
|
}
|
|
@@ -161,6 +162,7 @@ class User extends UserModel
|
|
|
'user_id'=> $userInfo['user_id'],
|
|
'user_id'=> $userInfo['user_id'],
|
|
|
'school_id'=> (int)$data['school_id'],
|
|
'school_id'=> (int)$data['school_id'],
|
|
|
'position'=> isset($data['position'])? intval($data['position']) : 0,
|
|
'position'=> isset($data['position'])? intval($data['position']) : 0,
|
|
|
|
|
+ 'speciality'=> isset($data['speciality'])? intval($data['speciality']) : 0,
|
|
|
'qq'=> isset($data['qq'])? $data['qq'] : '',
|
|
'qq'=> isset($data['qq'])? $data['qq'] : '',
|
|
|
'idcard'=> isset($data['idcard'])? $data['idcard'] :'',
|
|
'idcard'=> isset($data['idcard'])? $data['idcard'] :'',
|
|
|
'idcard_front_img'=> isset($data['idcard_front_img'])? $data['idcard_front_img'] :'',
|
|
'idcard_front_img'=> isset($data['idcard_front_img'])? $data['idcard_front_img'] :'',
|
|
@@ -247,6 +249,10 @@ class User extends UserModel
|
|
|
throwError('请选择入学年份');
|
|
throwError('请选择入学年份');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if(empty($data['speciality'])){
|
|
|
|
|
+ throwError('请选择就读专业');
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if(empty($data['education_certify'])){
|
|
if(empty($data['education_certify'])){
|
|
|
throwError('请上传教育证明');
|
|
throwError('请上传教育证明');
|
|
|
}
|
|
}
|