Commit 85fbbc6a authored by clone's avatar clone

bug

parent 3d0495b5
...@@ -81,10 +81,9 @@ class HomePageLog extends Basic ...@@ -81,10 +81,9 @@ class HomePageLog extends Basic
$where_["f.city"] = trim($this->city) ? trim($this->city) : '上海市'; $where_["f.city"] = trim($this->city) ? trim($this->city) : '上海市';
$join = [];
$order = "f.id desc"; $order = "f.id desc";
$result = $this->uPhoneFollowUpModel->getSearch($pageNo, $pageSize, $order, $field, $join, $where_, ""); $result = $this->uPhoneFollowUpModel->getSearch($pageNo, $pageSize, $order, $field, [], $where_, "");
foreach ($result as $key => $value) { foreach ($result as $key => $value) {
$agent_params = []; $agent_params = [];
...@@ -98,7 +97,7 @@ class HomePageLog extends Basic ...@@ -98,7 +97,7 @@ class HomePageLog extends Basic
} }
$count = $this->uPhoneFollowUpModel->getSearchCount($join, $where_); $count = $this->uPhoneFollowUpModel->getSearchCount($where_);
if (count($result) > 0) { if (count($result) > 0) {
$list["result"] = $result; $list["result"] = $result;
$list["img_path"] = AGENTHEADERIMGURL; $list["img_path"] = AGENTHEADERIMGURL;
......
...@@ -102,15 +102,13 @@ class UPhoneFollowPp extends BaseModel ...@@ -102,15 +102,13 @@ class UPhoneFollowPp extends BaseModel
} }
/** /**
* @param $join
* @param $where * @param $where
* @return int * @return int
*/ */
public function getSearchCount( $join, $where) public function getSearchCount( $where)
{ {
$r = $this $r = $this
->alias('f') ->alias('f')
->join($join)
->where($where) ->where($where)
->count(); ->count();
return $r; return $r;
......
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