Skip to content

T
tl_estate
Commit 4f9ada3f authored by zw's avatar zw
Browse files
Options

bug

parent 0cadd511
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
application/index/controller/CellPhone.php
View file @ 4f9ada3f
...@@ -98,7 +98,9 @@ class CellPhone extends Basic ...@@ -98,7 +98,9 @@ class CellPhone extends Basic
$list = $report->getCallList($pageNo, $pageSize, 'id desc', $field, $where); $list = $report->getCallList($pageNo, $pageSize, 'id desc', $field, $where);
$m_user = new Users(); $m_user = new Users();
$m_phone_follow = new UPhoneFollowUp($this->siteId); $m_phone_follow = new UPhoneFollowUp($this->siteId);
$m_phone_follow_temp = new UPhoneFollowUpTemporary($this->siteId); if($this->params['end_date'] >= date('Y-m-d',time())){
$m_phone_follow_temp = new UPhoneFollowUpTemporary($this->siteId);
}
$m_agent = new AAgents(); $m_agent = new AAgents();
foreach ($list as $k => $v) { foreach ($list as $k => $v) {
if (empty($v['agents_id'])) { if (empty($v['agents_id'])) {
...@@ -148,8 +150,12 @@ class CellPhone extends Basic ...@@ -148,8 +150,12 @@ class CellPhone extends Basic
$where_follow['user_id'] = $v['users_id']; $where_follow['user_id'] = $v['users_id'];
$where_follow['type'] = 0; $where_follow['type'] = 0;
$where_follow['agent_id'] = $v['agents_id']; $where_follow['agent_id'] = $v['agents_id'];
$result[$k]['content'] = $m_phone_follow_temp->getUserFollowKey('content', $where_follow, 'id DESC'); if($this->params['end_date'] >= date('Y-m-d',time())){
if (empty($result[$k]['content'])) { $result[$k]['content'] = $m_phone_follow_temp->getUserFollowKey('content', $where_follow, 'id DESC');
if (empty($result[$k]['content'])) {
$result[$k]['content'] = $m_phone_follow->getUserFollowKey('content', $where_follow, 'id DESC');
}
}else{
$result[$k]['content'] = $m_phone_follow->getUserFollowKey('content', $where_follow, 'id DESC'); $result[$k]['content'] = $m_phone_follow->getUserFollowKey('content', $where_follow, 'id DESC');
} }
} else { } else {
......
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