1

application/index/service/PhoneFollowUpService.php

@@ -77,7 +77,7 @@ class PhoneFollowUpService
         }
 
         if (!empty($params['store_id'])) {
-            $agent_where['store_id'] = $params['remark_store_id'];
+            $agent_where['store_id'] = $params['store_id'];
         }
 
         if (!empty($params['district_id'])) {

application/model/UPhoneFollowUpTemporary.php

@@ -164,12 +164,9 @@ class UPhoneFollowUpTemporary extends BaseModel
     }
 
     public function getFollowListV3($site_id,$pageNo = 1, $pageSize = 15, $where, $filed = '`id`, `user_id`, `create_time`, `content`, `user_status`, `labels_id`, `agent_id`') {
-        $sql  = $this->follow_up->field($filed)->where($where)->buildSql();
-        $sql_temp  = $this->follow_up->table('u_phone_follow_up_'.$site_id)->field($filed)->where($where)->buildSql();
-
-        $sql_string = $this->table($this->table_name_string)->field($filed)->where($where)->union($sql,$sql_temp)->buildSql();
+        $sql  = Db::table('u_phone_follow_up_'.$site_id)->field($filed)->where($where)->buildSql();
+        $sql_string = $this->table($this->table_name_string)->field($filed)->where($where)->union([$sql], true)->buildSql();
         $data = Db::table($sql_string. ' a')
-            ->where($where)
             ->limit($pageSize)
             ->page($pageNo)
             ->select();