このコミットが含まれているのは:
守矢諏訪子 2021-11-16 01:38:16 +09:00
コミット 7d46fd816b
1個のファイルの変更10行の追加3行の削除

ファイルの表示

@ -531,11 +531,18 @@ class MeetingsController extends Controller {
if (request()->route()->action['as'] != 'mdc') {
$result->children = [];
$rec = [];
if (null !== ($rel = FatherRelation::select('child_id')->where('father_id', (int)$result->father_id)->first())) {
if (null === ($result->children = Child::select($all_child_select)->where('id', $rel->child_id)->get()->toArray())) {
$result->children = [];
if (null !== ($rel = FatherRelation::select('child_id')->where('father_id', (int)$result->father_id)->get())) {
foreach ($rel as $i => $re) {
if (null !== ($rech = Child::select($all_child_select)->where('id', $re->child_id)->first())) {
if (!in_array($rech, $rec)) {
$rec[$i] = $rech;
}
}
}
$result->children = $rec;
}
foreach ($result->approval as $i => $a) {