Commit ae5bbd98 authored by hujun's avatar hujun

1

parent d62819d6
...@@ -102,13 +102,17 @@ class PhoneFollowUpService ...@@ -102,13 +102,17 @@ class PhoneFollowUpService
if (empty($data) || $num < $page_size) { if (empty($data) || $num < $page_size) {
$count = (int)$page_size - (int)$data; $count = (int)$page_size - (int)$data;
if ($count > 0) { if ($count > 0) {
$new_count = $this->phoneFollowUpTemporary->getFollowTotal($where);
// $count = $new_count
$old_data = $this->phoneFollowUp->getFollowList(1, $count, $order_ = 'id desc', $field, $where); $old_data = $this->phoneFollowUp->getFollowList(1, $count, $order_ = 'id desc', $field, $where);
//拼接数据 //拼接数据
foreach ($old_data as $v) { foreach ($old_data as $v) {
$data[$count] = $v; $data[$count] = $v;
$count++; $count++;
} }
} else {
$data = $this->phoneFollowUp->getFollowList($page_no, $page_size, $order_ = 'id desc', $field, $where);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment