|
|
@@ -70,9 +70,12 @@ class CheckInController extends Controller
|
|
|
public function show(Request $request, CheckIn $checkIn)
|
|
|
{
|
|
|
//
|
|
|
- $checkIn = CheckIn::where('user_id', '=', $request->id)->where('activity_id', '=', $request->activity_id)->first();
|
|
|
+ $checkIn = $request->activity_id ?
|
|
|
+ CheckIn::where('user_id', '=', $request->id)->where('activity_id', '=', $request->activity_id)->first()
|
|
|
+ : CheckIn::where('user_id', '=', $request->id)->first();
|
|
|
+
|
|
|
$department = Department::where('department_id', '=', $checkIn->department_id)->first();
|
|
|
- $checkIn->department = $department->department_name;
|
|
|
+ $checkIn->department = $department->department_name ?? '暫無部門';
|
|
|
$response = [
|
|
|
'checkIn' => $checkIn,
|
|
|
];
|