|
@@ -1924,7 +1924,7 @@ class RecruitController extends Controller
|
|
|
|
|
|
$data = $request->all();
|
|
$data = $request->all();
|
|
$where = [];
|
|
$where = [];
|
|
- $where[] = ['audit','>',0];
|
|
|
|
|
|
+ $where[] = ['recruit_appoint_info.audit','>',0];
|
|
$where[] = ['recruit_appoint_info.recruit_id', '=', $data['id']];
|
|
$where[] = ['recruit_appoint_info.recruit_id', '=', $data['id']];
|
|
$param = parse_url($data['where']);
|
|
$param = parse_url($data['where']);
|
|
parse_str($param['query'],$param);
|
|
parse_str($param['query'],$param);
|
|
@@ -1939,7 +1939,7 @@ class RecruitController extends Controller
|
|
}
|
|
}
|
|
}
|
|
}
|
|
$select = ['recruit_appoint_info.*', 'recruit_post.code', 'recruit_post.name'];
|
|
$select = ['recruit_appoint_info.*', 'recruit_post.code', 'recruit_post.name'];
|
|
- $model = RecruitAppointInfo::where($where)->join('recruit_post', 'recruit_appoint_info.post_id', '=', 'recruit_post.id', 'left');
|
|
|
|
|
|
+ $model = RecruitAppointInfo::where($where)->join('recruit_post', 'recruit_appoint_info.post_id', '=', 'recruit_post.id', 'left')->join('recruit_ticket','recruit_ticket.appoint_id','=','recruit_appoint_info.id','left');
|
|
if(in_array('expand_special',explode(',', $recruit->forms))){
|
|
if(in_array('expand_special',explode(',', $recruit->forms))){
|
|
$model->join('recruit_appoint_expand_special', 'recruit_appoint_expand_special.recruit_appoint_id', '=', 'recruit_appoint_info.id', 'left');
|
|
$model->join('recruit_appoint_expand_special', 'recruit_appoint_expand_special.recruit_appoint_id', '=', 'recruit_appoint_info.id', 'left');
|
|
$special_select = ['recruit_appoint_expand_special.point_apply','recruit_appoint_expand_special.condition','recruit_appoint_expand_special.material'];
|
|
$special_select = ['recruit_appoint_expand_special.point_apply','recruit_appoint_expand_special.condition','recruit_appoint_expand_special.material'];
|