suwako
/
kikikan
アーカイブ
1
0
フォーク 0
コード イシュー プルリクエスト プロジェクト リリース Wiki アクティビティ

Merge branch 'backend' of https://github.com/nakazawakan/kikikanri into c_account_search

このコミットが含まれているのは:
dragon1211 2021-11-06 17:37:29 +09:00
親 81524b3984 5829ef86de
コミット 7c54c6e827
1個のファイルの変更、16行の追加、8行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

24
backend/app/Http/Controllers/Api/MeetingsController.php
ファイルの表示

@ -151,8 +151,10 @@ class MeetingsController extends Controller {
if (null === ($l->meeting_images = MeetingImage::select($meeting_images_select)->where('meeting_id', (int)$l->id)->get())) {
$l->meeting_images = [];
}
if (null === ($l->fathers = Father::select($father_select)->where('id', (int)$l->father_id)->first())) {
$l->fathers = new \stdClass();
if (null !== ($fr = FatherRelation::select('father_id')->where('child_id', (int)$r->child_id)->first())) {
if (null === ($l->father = Father::select($father_select)->where('id', (int)$fr->father_id)->first())) {
$l->father = new \stdClass();
}
}
if (null === ($l->meeting_approvals = MeetingApprovals::select($meeting_approvals_select)->whereNotNull('approval_at')->where('meeting_id', (int)$l->id)->orderBy('updated_at', 'desc')->get())) {
$l->meeting_approvals = [];
@ -189,8 +191,10 @@ class MeetingsController extends Controller {
if (null === ($l->meeting_images = MeetingImage::select($meeting_images_select)->where('meeting_id', (int)$l->id)->get())) {
$l->meeting_images = [];
}
if (null === ($l->fathers = Father::select($father_select)->where('id', (int)$l->father_id)->first())) {
$l->fathers = new \stdClass();
if (null !== ($fr = FatherRelation::select('father_id')->where('child_id', (int)$r->child_id)->first())) {
if (null === ($l->father = Father::select($father_select)->where('id', (int)$fr->father_id)->first())) {
$l->father = new \stdClass();
}
}
if (null === ($l->meeting_approvals = MeetingApprovals::select($meeting_approvals_select)->whereNull('approval_at')->where('meeting_id', (int)$l->id)->orderBy('approval_at', 'asc')->get())) {
$l->meeting_approvals = [];
@ -351,8 +355,10 @@ class MeetingsController extends Controller {
}
foreach ($list as $i => $l) {
if (null === ($l->father = Father::select($father_select)->where('id', (int)$l->father_id)->first())) {
$l->father = [];
if (null !== ($fr = FatherRelation::select('father_id')->where('child_id', (int)$r->child_id)->first())) {
if (null === ($l->father = Father::select($father_select)->where('id', (int)$fr->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 = [];
@ -379,8 +385,10 @@ class MeetingsController extends Controller {
}
foreach ($list as $i => $l) {
if (null === ($l->father = Father::select($father_select)->where('id', (int)$l->father_id)->first())) {
$l->father = [];
if (null !== ($fr = FatherRelation::select('father_id')->where('child_id', (int)$r->child_id)->first())) {
if (null === ($l->father = Father::select($father_select)->where('id', (int)$fr->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 = [];