diff --git a/app/Models/Address.php b/app/Models/Address.php index dd2b994..9b5f370 100644 --- a/app/Models/Address.php +++ b/app/Models/Address.php @@ -835,7 +835,7 @@ class Address extends Model $netmails = $this ->UncollectedNetmail() ->select('netmails.id') - ->where('addresses.id',$this->id) + ->whereIn('addresses.id',$this->children()->add($this)->pluck('id')) ->groupBy(['netmails.id']) ->get(); @@ -855,7 +855,7 @@ class Address extends Model ->whereRaw(sprintf('(flags & %d) > 0',Message::FLAG_PKTPASSWD)) ->whereRaw(sprintf('(flags & %d) = 0',Message::FLAG_SENT)) ->select('netmails.id') - ->where('addresses.id',$this->id) + ->whereIn('addresses.id',$this->children()->add($this)->pluck('id')) ->groupBy(['netmails.id']) ->get();