国家筛选

app/controller/CustomerController.php

@@ -33,7 +33,8 @@ class CustomerController
         $gradeConstants = Constants::GRADE_EN;
 
         //$language = $request->user['language'];
-        $language = 'zh_CN';
+        //$language = 'zh_CN';
+        $language = $request->language;
         if($language == 'zh_CN'){
             $gradeConstants = Constants::GRADE;
         }elseif ($language == 'ru'){
@@ -58,7 +59,8 @@ class CustomerController
         $grade = [];
         $magnitudeConstants = Constants::MAGNITUDE_EN;
         //$language = $request->user['language'];
-        $language = 'zh_CN';
+        //$language = 'zh_CN';
+        $language = $request->language;
         if($language == 'zh_CN'){
             $magnitudeConstants = Constants::MAGNITUDE;
         }elseif ($language == 'ru'){
@@ -83,7 +85,8 @@ class CustomerController
         $list = Channel::getAll();
 
         //$language = $request->user['language'];
-        $language = 'zh_CN';
+        //$language = 'zh_CN';
+        $language = $request->language;
         if($language != 'zh_CN'){
             foreach ($list as &$value) {
                 $value['name'] = $value['name_en'];
@@ -147,6 +150,7 @@ class CustomerController
         $keyword = $request->input('keyword', ''); //follow_last
         $follow_last = $request->input('follow_last', ''); //最后跟进：1:当天跟进客户，2:近三天跟进客户，3:近七天跟进客户
         $tagId = $request->input('tag_id', ''); //打有某个标签的客户
+        $countryId = $request->input('country_id', ''); //打有某个标签的客户
         $seas = $request->input('seas', ''); //公海客户
 
         $where = [];
@@ -161,6 +165,9 @@ class CustomerController
         }else{
             $where[] = ['user_id', $userId];
         }
+        if (!empty($countryId)){
+            $where[] = ['country_id', $countryId];
+        }
         //验证权限
 //        if ($request->user['role'] != 1) {
 //            $where[] =['user_id',$userId] ;
@@ -187,12 +194,17 @@ class CustomerController
         $query = Customer::with('tags')->where($where)
             ->orderBy('crm_customer.id', 'desc');
         if(!empty($tagId)){
-//            $query->with(['tags' => function($query) use ($tagId){
+            //查询有$tagId 里任意一个标签的客户
+//            $query->whereHas('tags', function($query) use ($tagId){
 //                $query->where('tag.id', $tagId);
-//            }]);
-            $query->whereHas('tags', function($query) use ($tagId){
-                $query->where('tag.id', $tagId);
-            });
+//            });
+
+            //查询有$tagId 里所有标签的客户
+            foreach ($tagId as $id) {
+                $query->whereHas('tags', function($query) use ($id){
+                    $query->where('tag.id', $id);
+                });
+            }
         }
         if (!Util::isEmpty($keyword)) {
             $query->where(function ($query) use ($keyword) {