全部客户（all_user）2

application/api_broker/controller/Client.php

@@ -222,11 +222,11 @@ class Client extends Basic
         $params                     = $this->params;
 
         #测试数据
-        $params['phone_or_name']    ='22';
+        $params['phone_or_name']    ='666';
         $params['pagenum']          ='1';
         $params['user_id']          ='10';
         $params['type']             = 0;
-        $params['search_type']      = '';
+        $params['search_type']      = '2';
         #测试数据 end
 
         if (!isset($params['phone_or_name']) || !isset($params['user_id'])) {
@@ -248,27 +248,20 @@ class Client extends Basic
             $user_res   =$user->all_user_search_phone($phone_or_name,$pagesize,$pagenum);
             //$user_res   =$user->user_search($phone_or_name,$Two_days_ago,$user_id,$pagesize,$pagenum);
             $total      =$user->all_user_search_count_phone($phone_or_name);
-            foreach($user_res as $k=>$v){
-                //dump($v);exit;
-                $user_res[$k]['user_nick']=$v['user_nick']?$v['user_nick']:'未知';
-                $user_res[$k]['label']='我的，保护期内';
-            }
+
         }elseif ($search_type=='1'){//客户电话
             $user = new Users();
             // 查询数据集
             $user_res   =$user->all_user_search_name($phone_or_name,$pagesize,$pagenum);
             //$user_res   =$user->user_search($phone_or_name,$Two_days_ago,$user_id,$pagesize,$pagenum);
             $total      =$user->all_user_search_count_name($phone_or_name);
-            foreach($user_res as $k=>$v){
-                //dump($v);exit;
-                $user_res[$k]['user_nick']=$v['user_nick']?$v['user_nick']:'未知';
-                $user_res[$k]['label']='我的，保护期内';
-            }
+
         }elseif ($search_type=='2'){//跟进
             $UPhoneFollowPp     = new UPhoneFollowPp();
             // 查询电话跟进数据
             $user_res=$UPhoneFollowPp->all_user_search($phone_or_name,$pagesize,$pagenum);
             $total      = $UPhoneFollowPp->all_user_search_count($phone_or_name);
+            //dump($total);exit;
         }else{//全部客户
             $user = new Users();
             // 查询数据集
@@ -297,6 +290,14 @@ class Client extends Basic
                 }
                 $user_res[$k]['label']=implode(',',$label);
             }
+        }else{
+            foreach($user_res as $k=>$v){
+                $table= new Agents();
+                $Agents_res   =$table->Agents_res($v['agent_id']);
+                //dump($Agents_res);
+                $user_res[$k]['agentinfo']=$Agents_res?$Agents_res['agentshopname'].'-'.$Agents_res['realname']:'未知';
+                $user_res[$k]['user_pic']=ADMIN_URL_TL.'user_header/'.$Agents_res['head_portrait'];
+            }
         }
 
         /*dump($total);
@@ -304,7 +305,7 @@ class Client extends Basic
         exit;*/
 
         if ($user_res) {
-            return $this->response("200", "success！", ['user_date'=>$user_res,'pagenum'=>$pagenum,'total'=>$total]);
+            return $this->response("200", "success！", ['user_date'=>$user_res,'pagenum'=>$pagenum,'total'=>$total,'search_type'=>$search_type]);
         } else {
             return $this->response("101", "失败！");
         }

application/model/UPhoneFollowPp.php

@@ -128,7 +128,7 @@ class UPhoneFollowPp extends BaseModel
     {
         $UPhoneFollowPp_res   = db('u_phone_follow_up')
             //->where('user_id',$user_id)
-            ->where('content',$searchdate)
+            ->where('content','like',"%$searchdate%")
             ->order('create_time', 'desc')
             ->limit($pagesize)
             ->page($pagenum)
@@ -144,11 +144,11 @@ class UPhoneFollowPp extends BaseModel
     {
         $UPhoneFollowPp_res   = db('u_phone_follow_up')
             //->where('user_id',$user_id)
-            ->where('content',$searchdate)
+            ->where('content','like',"%$searchdate%")
             ->order('create_time', 'desc')
             //->limit($pagesize)
             //->page($pagenum)
-            ->select();
+            ->count();
         /*$total =$UPhoneFollowPp
                ->where('user_id',$user_id)
                ->where('content',$searchdate)