Merge branch 'hotfix/crm' into develop

app/crm/service/CustomerService.php

@@ -46,6 +46,7 @@ class CustomerService
         $sort = $params['sort'] ?? null;
         $sortId = $params['sort_id'] ?? null;
         $countryId = $params['country_id'] ?? '';
+        $channelId = $params['channel_id'] ?? '';
         $where = [];
         $user_id =$params['user_id'];
 
@@ -62,6 +63,9 @@ class CustomerService
         if (!empty($countryId)){
             $where[] = ['country_id', $countryId];
         }
+        if (!empty($channelId)){
+            $where[] = ['channel_id', $channelId];
+        }
 
         $grade = [];
         if (!Util::isEmpty($follow) && $follow == 0) {

app/crmAdmin/service/CustomerService.php

@@ -53,6 +53,7 @@ class CustomerService
         $user_id = $params['user_id'] ?? '';
         $seas = $params['seas'] ?? ''; //recyclea:管理端回收站，audit:待审核列表，seas:公海
         $scene = $params['scene'] ?? '';
+        $channelId = $params['channel_id'] ?? '';
         $where = [];
 
         if ($scene == 'audit') {
@@ -69,6 +70,9 @@ class CustomerService
 //            $where[] = ['user_id', $user_id];
 //        }
 
+        if (!empty($channelId)){
+            $where[] = ['channel_id', $channelId];
+        }
 
         $grade = [];
         if (!Util::isEmpty($follow) && $follow == 0) {