s

backend/app/Http/Controllers/Api/MeetingApprovalsController.php

@@ -24,8 +24,11 @@ class MeetingApprovalsController extends Controller {
                 if (null === ($apr = MeetingApprovals::select('id')->where('meeting_id', (int)$l->id)->get())) {
                     continue;
                 }
+
+                $cnt = MeetingApprovals::select('id')->whereNotNull('approval_at')->where('meeting_id', (int)$l->id)->count();
+                $apr = count($apr);
     
-                if (count($apr) == MeetingApprovals::select('id')->whereNotNull('approval_at')->where('meeting_id', (int)$l->id)->count()) {
+                if ($apr != 0 && $apr == $cnt) {
                     continue;
                 }
     

backend/app/Http/Controllers/Api/MeetingsController.php

@@ -567,10 +567,19 @@ class MeetingsController extends Controller {
                 continue;
             }
 
-            if (count($l->approvals) == MeetingApprovals::select($meeting_approvals_select)->whereNotNull('approval_at')->where('meeting_id', (int)$l->id)->count()) {
+            $cnt = MeetingApprovals::select($meeting_approvals_select)->whereNotNull('approval_at')->where('meeting_id', (int)$l->id)->count();
+            $acnt = count($l->approvals);
+
+            if ($acnt != 0 && $acnt == $cnt) {
                 continue;
             }
 
+            if ($acnt == 0 && $cnt == 0) {
+                if (!in_array($l, $result)) {
+                    $result[] = $l;
+                }
+            }
+
             foreach ($l->approvals as $ii => $ll) {
                 if (null === ($ll->child = Child::select($child_select)->where('id', (int)$ll->child_id)->first())) {
                     $ll->child = new \stdClass();

backend/app/Http/Middleware/NoticeIncomplete.php

@@ -31,8 +31,11 @@ class NoticeIncomplete
                 if (null === ($apr = MeetingApprovals::select('id')->where('meeting_id', (int)$l->id)->get())) {
                     continue;
                 }
+
+                $cnt = MeetingApprovals::select('id')->whereNotNull('approval_at')->where('meeting_id', (int)$l->id)->count();
+                $apr = count($apr);
     
-                if (count($apr) == MeetingApprovals::select('id')->whereNotNull('approval_at')->where('meeting_id', (int)$l->id)->count()) {
+                if ($apr != 0 && $apr == $cnt) {
                     continue;
                 }