Commit 60cc847b authored by zw's avatar zw

bug

parent 2d2f3ca8
...@@ -209,10 +209,9 @@ class UserLogService ...@@ -209,10 +209,9 @@ class UserLogService
$field_user_follow = "a.id,a.content,a.user_id,a.agent_id,a.type,a.create_time,a.user_status,b.name,b.phone,b.img"; $field_user_follow = "a.id,a.content,a.user_id,a.agent_id,a.type,a.create_time,a.user_status,b.name,b.phone,b.img";
$bargainData = $uPhoneFollowTempModel->getFollowList($page_no,$page_size,"",$field_user_follow, $userParams); $bargainData = $uPhoneFollowTempModel->getFollowUpList($field_user_follow, $userParams,$page_no,$page_size);
if(count($bargainData) <= 0){ if(count($bargainData) <= 0){
$bargainData = $uPhoneFollowModel->getFollowUpList($field_user_follow, $userParams,$page_no,$page_size); $bargainData = $uPhoneFollowModel->getFollowUpList($field_user_follow, $userParams,$page_no,$page_size);
} }
return $bargainData; return $bargainData;
} }
......
...@@ -112,6 +112,29 @@ class UPhoneFollowUpTemporary extends BaseModel ...@@ -112,6 +112,29 @@ class UPhoneFollowUpTemporary extends BaseModel
->select(); ->select();
} }
public function getFollowUpList($field, $params,$page_no,$page_size)
{
if(!$this->createTable()){
return null;
}
$where_ = [];
if (isset($params["user_id"])) {
$where_["a.user_id"] = $params["user_id"];
}
$result = $this->follow_up
->field($field)
->alias("a")
->join("a_agents b", "a.agent_id = b.id", "left")
->where($where_)
->order("a.create_time desc")
->page($page_no)
->limit($page_size)
->select();
return $result;
}
/** /**
* 插入默认跟进 * 插入默认跟进
* *
......
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