Commit c6cf755f authored by clone's avatar clone

1

parent 208829e8
......@@ -107,6 +107,7 @@ class HomePageLog extends Basic
}
}
$if_search = false;
$date = date("Y-m-d", time());
if ($start_time >= $date && $start_time <= $date . " 23:59:59") {
$result = $this->phoneFollowUpTemporary->getFollowList($pageNo, $pageSize, $order_ = 'id desc', $field, $where_);
......@@ -117,6 +118,7 @@ class HomePageLog extends Basic
$search_result = $searchService->searchByKeyword($params, $pageNo, $pageSize, $agentId);
$search_result = json_decode($search_result, true);
$result = $search_result["result"]["items"];
$if_search = true;
} else {
$result = $this->uPhoneFollowUpModel->getFollowList($pageNo, $pageSize, '', $field, $where);
}
......@@ -137,6 +139,8 @@ class HomePageLog extends Basic
$result[$key]['name'] = $res_a[0]['name'];
$result[$key]['img'] = $res_a[0]['img'];
$result[$key]['store_name'] = $res_a[0]['store_name'];
if ($if_search)
$result[$key]['create_time'] = date("Y-m-d H:i:s",$value["create_time"]);
//判断客户是否超过24小时保护期间 0:保护器内 1:超过保护期
$ser = new UserExpiredTimeService();
......
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