src/Services/BaseAuthConfig.php

@@ -34,18 +34,10 @@ trait BaseAuthConfig
                     $this->fields[$name] = $config->company_id;
                     break;
                 case 'channel_user_ids':
-                    $this->fields[$name] = ChannelUser::leftjoin('distribution_channels','distribution_channels.channel_user_id','channel_users.id')
-                        ->where('channel_users.company_id', $this->company_id)
-                        ->where('distribution_channels.is_qapp',0)
-                        ->pluck('channel_users.id')
-                        ->all();
+                    $this->fields[$name] = ChannelUser::where('company_id', $this->company_id)->pluck('id')->all();
                     break;
                 case 'phones':
-                    $this->fields[$name] = ChannelUser::leftjoin('distribution_channels','distribution_channels.channel_user_id','channel_users.id')
-                        ->where('channel_users.company_id', $this->company_id)
-                        ->where('distribution_channels.is_qapp',0)
-                        ->pluck('channel_users.phone')
-                        ->all();
+                    $this->fields[$name] = ChannelUser::where('company_id', $this->company_id)->pluck('phone')->all();
                     break;
                 case 'channel_ids':
                     $this->fields[$name] = Channel::whereIn('channel_user_id', $this->channel_user_ids)->pluck('id')->all();

src/Services/Channel/ChannelService.php

@@ -10,7 +10,6 @@
 namespace General\Services\Channel;
 
 use General\Models\Channel\Channel;
-use General\Models\Channel\ChannelUser;
 use Illuminate\Support\Facades\DB;
 
 class ChannelService
@@ -24,21 +23,16 @@ class ChannelService
 
         \Log::info('channel_user_ids: '.json_encode($channel_user_ids, 256));
         if ($phone || $phone !== '') {
-//            $channel_user_id = DB::connection('mysql')->table('channel_users')->where(['phone'=>$phone])->pluck('id')->all();
-            $channel_user_id = ChannelUser::leftjoin('distribution_channels','distribution_channels.channel_user_id','channel_users.id')
-                ->where('channel_users.phone', $phone)
-                ->where('distribution_channels.is_qapp',0)
-                ->pluck('channel_users.id')
-                ->all();
+            $channel_user_id = DB::connection('mysql')->table('channel_users')->where(['phone'=>$phone])->pluck('id')->all();
             \Log::info('channel_user_id: '.json_encode($channel_user_id, 256));
-            if ($channel_user_id && !empty($channel_user_id)) {
+            if ($channel_user_id) {
                 $channel_user_ids = $channel_user_id;
             }
         }
 
         if ($where) {
-            return Channel::whereIn('channel_user_id', $channel_user_ids)->where($where)->get();
+            return Channel::whereIn('channel_user_id', $channel_user_ids)->where($where)->where('is_qapp',0)->get();
         }
-        return Channel::whereIn('channel_user_id', $channel_user_ids)->get();
+        return Channel::whereIn('channel_user_id', $channel_user_ids)->where('is_qapp',0)->get();
     }
 }