msg

application/index/controller/Remark.php

@@ -196,6 +196,15 @@ class Remark extends Basic
         if (!empty($this->params['agent_id'])) {
             $where['agent_id'] = $this->params['agent_id'];
         }
+        if (!empty($this->params['content'])) {
+            $where['content'] = $this->params['content'];
+        }
+        if (!empty($this->params['remark_store_id'])) {
+            $where['store_id'] = $this->params['remark_store_id'];
+        }
+        if (!empty($this->params['remark_district_id'])) {
+            $where['district_id'] = $this->params['remark_district_id'];
+        }
 
         $result_data = $follow_up_service->getPhoneFollowList($this->params['start_date'], $this->params['end_date'], $where, $this->userId);
         $label_data = $m_label->getColumn('id,name', ['type'=>1]);  //获取标签

application/index/service/PhoneFollowUpService.php

@@ -49,7 +49,6 @@ class PhoneFollowUpService
         $page_no = isset($params['page_no']) ? $params['page_no'] : 1;
         $page_size = isset($params['page_size']) ? $params['page_size'] : 15;
 
-
         $is_check = $vrs->followUpClick($agent_id);
         if($page_no == 1 && !$is_check){
             $is_bool = $vrs->getCurrTimeSection();
@@ -83,12 +82,16 @@ class PhoneFollowUpService
             $agent_where['district_id'] = $params['district_id'];
         }
 
+        if (!empty($params['content'])) {
+            $where .= " AND content LIKE '%{$params['content']}%'";
+        }
+
         if (!empty($agent_where)) {
             $m_agent = new AAgents();
             $agent_id = $m_agent->getAgentsByWhereColumn($agent_where, 'id');
 
             if (empty($agent_id)) {
-                return $data;
+                return ['code'=>'101','data'=>'暂无数据'];
             } else {
                 $where .= " AND agent_id in {implode(',', $agent_id)}";
             }