Commit d76bd547 authored by hujun's avatar hujun

array

parent 66395107
......@@ -49,15 +49,15 @@ 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();
$msg = "请勿频繁请求";
if($is_bool) {
$msg = "高峰期间每10秒钟只能搜索一次(6.30-8.30)";
}
return ['code'=>'101','data'=>$msg];
}
// $is_check = $vrs->followUpClick($agent_id);
// if($page_no == 1 && !$is_check){
// $is_bool = $vrs->getCurrTimeSection();
// $msg = "请勿频繁请求";
// if($is_bool) {
// $msg = "高峰期间每10秒钟只能搜索一次(6.30-8.30)";
// }
// return ['code'=>'101','data'=>$msg];
// }
$where = ' 1=1 ';
if (empty($start_time) || empty($end_time)) {
return ['code'=>'101','data'=>'时间不能为空'];
......@@ -93,7 +93,8 @@ class PhoneFollowUpService
if (empty($agent_id)) {
return ['code'=>'101','data'=>'暂无数据'];
} else {
$where .= " AND agent_id in {implode(',', $agent_id)}";
$agent_id_string = implode(',', $agent_id);
$where .= " AND agent_id in ({$agent_id_string})";
}
}
......
......@@ -163,6 +163,7 @@ class Users extends Model
}
//echo Db::table($this->table)->getLastSql();
$s_phone_follow_up = new UPhoneFollowUp($site_id);
$s_phone_follow_temp = new UPhoneFollowUpTemporary($site_id);
foreach ($result as $k => $v) {
$data[$k] = $v->getData();
......@@ -179,7 +180,10 @@ class Users extends Model
$params_['user_id']= $data[$k]['id'];
$order= 'id desc';
$res = $s_phone_follow_up->getPhoneFollowData('create_time',$params_,$order);
$res = $s_phone_follow_temp->getPhoneFollowData('create_time',$params_,$order);
if (empty($res)) {
$res = $s_phone_follow_up->getPhoneFollowData('create_time',$params_,$order);
}
$data[$k]['follow_time'] = $res[0]['create_time'];
}
return $data;
......
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