跟进列表搜索修改

application/index/controller/Remark.php

@@ -76,15 +76,13 @@ class Remark extends Basic
         }
 
         //跟进人门店
-        if (!empty($this->params['remark_store'])) {
-            $where['f.district_name'] = ['NOT NULL'];
-            $where['e.store_name'] = ['like', "%{$this->params['remark_store']}%"];
+        if (!empty($this->params['remark_store_id'])) {
+            $where['b.stroe_id'] = $this->params['remark_store_id'];
         }
 
         //跟进人部门
-        if (!empty($this->params['remark_district'])) {
-            $where['e.store_name'] = ['NOT NULL'];
-            $where['f.district_name'] = ['like', "%{$this->params['remark_district']}%"];
+        if (!empty($this->params['remark_district_id'])) {
+            $where['b.district_id'] = $this->params['remark_district_id'];
         }
 
         $field = 'c.id,a.create_time,a.content,b.name as admin,d.name as label_name,c.user_nick,c.user_phone,a.user_status';

application/model/UPhoneFollowPp.php

@@ -217,8 +217,6 @@ class UPhoneFollowPp extends BaseModel
             ->join('a_agents b','a.agent_id = b.id', 'left')
             ->join('u_users c','a.user_id = c.id', 'left')
             ->join('u_labels d','d.id = a.labels_id', 'left')
-            ->join('a_store e', 'b.store_id = e.id', 'left')
-            ->join('a_district f', 'b.district_id= f.id', 'left')
             ->where($params)
             ->order($order_)
             ->limit($pageSize)
@@ -237,8 +235,6 @@ class UPhoneFollowPp extends BaseModel
         return  $this->alias('a')
             ->join('a_agents b','a.agent_id = b.id', 'left')
             ->join('u_users c','a.user_id = c.id', 'left')
-            ->join('a_store e', 'b.store_id = e.id', 'left')
-            ->join('a_district f', 'b.district_id= f.id', 'left')
             ->where($params)
             ->count();
     }