、
このコミットが含まれているのは:
コミット
5c91e533b4
|
@ -356,8 +356,8 @@ class MeetingsController extends Controller {
|
|||
if (null === ($l->father = Father::select($father_select)->where('id', (int)$l->father_id)->first())) {
|
||||
$l->father = new \stdClass();
|
||||
}
|
||||
if (null === ($l->approval = MeetingApprovals::select($meeting_approvals_select)->where('child_id', (int)$r->child_id)->whereNotNull('approval_at')->get())) {
|
||||
$l->approval = [];
|
||||
if (null === ($l->approval = MeetingApprovals::select($meeting_approvals_select)->where('child_id', (int)$r->child_id)->whereNotNull('approval_at')->first())) {
|
||||
$l->approval = new \stdClass();;
|
||||
}
|
||||
$result[] = $l;
|
||||
}
|
||||
|
@ -384,8 +384,8 @@ class MeetingsController extends Controller {
|
|||
if (null === ($l->father = Father::select($father_select)->where('id', (int)$l->father_id)->first())) {
|
||||
$l->father = new \stdClass();
|
||||
}
|
||||
if (null === ($l->approval = MeetingApprovals::select($meeting_approvals_select)->where('child_id', (int)$r->child_id)->whereNull('approval_at')->get())) {
|
||||
$l->approval = [];
|
||||
if (null === ($l->approval = MeetingApprovals::select($meeting_approvals_select)->where('child_id', (int)$r->child_id)->whereNull('approval_at')->first())) {
|
||||
$l->approval = new \stdClass();
|
||||
}
|
||||
$result[] = $l;
|
||||
}
|
||||
|
|
新しいイシューから参照