|
@@ -997,6 +997,7 @@ class SpecialController extends Controller
|
|
$data->shixin = [];
|
|
$data->shixin = [];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ dd($data);
|
|
|
|
|
|
$html = view('admin.recruit.manageajax_userinfo')->with(['appointinfo' => $data,'recruit' => $recruit,'photos'=>$photos])->render();
|
|
$html = view('admin.recruit.manageajax_userinfo')->with(['appointinfo' => $data,'recruit' => $recruit,'photos'=>$photos])->render();
|
|
return response()->json(['code' => 1, 'data' => $html]);
|
|
return response()->json(['code' => 1, 'data' => $html]);
|
|
@@ -1719,12 +1720,12 @@ class SpecialController extends Controller
|
|
->get();
|
|
->get();
|
|
$data = [];
|
|
$data = [];
|
|
foreach ($list as $k => $v){
|
|
foreach ($list as $k => $v){
|
|
- $place = $v->ex_place == null ? 'empty' : $v->ex_place;
|
|
|
|
|
|
+ $place = $v->ex_place == null ? '' : $v->ex_place;
|
|
if(!array_key_exists($place,$data)){
|
|
if(!array_key_exists($place,$data)){
|
|
$data[$place] = [];
|
|
$data[$place] = [];
|
|
}
|
|
}
|
|
|
|
|
|
- $room = $v->ex_room == null ? 'empty' : $v->ex_room;
|
|
|
|
|
|
+ $room = $v->ex_room == null ? '' : $v->ex_room;
|
|
if(!array_key_exists($room,$data[$place])){
|
|
if(!array_key_exists($room,$data[$place])){
|
|
$data[$place][$room] = [];
|
|
$data[$place][$room] = [];
|
|
}
|
|
}
|