Commit 8f4bf208 authored by clone's avatar clone

bug

parent 498da586
...@@ -51,7 +51,7 @@ class TradeLog extends Basic ...@@ -51,7 +51,7 @@ class TradeLog extends Basic
$order_ = 'a.created desc'; $order_ = 'a.created desc';
$field = "a.id,a.tradecode,a.singntime,b.phpone,b.house_id,b.agent_id"; $field = "min(a.id) as id,a.tradecode,a.singntime,b.phpone,b.house_id,b.agent_id";
$result = $this->journalAccountsMode->getJournalAccountsList($pageNo, $pageSize, $order_, $field, $params); $result = $this->journalAccountsMode->getJournalAccountsList($pageNo, $pageSize, $order_, $field, $params);
if (count($result) <= 0) { if (count($result) <= 0) {
......
...@@ -96,13 +96,14 @@ class JournalAccounts extends Model ...@@ -96,13 +96,14 @@ class JournalAccounts extends Model
public function getJournalAccountsList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $param) public function getJournalAccountsList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $param)
{ {
$params["b.phpone"] = $param["phone"]; $params["b.phpone"] = $param["phone"];
$params["a.singntime"] = array( "neq", "null" ); // $params["a.singntime"] = array( "neq", "null" );
return $this->db return $this->db
->field($field) ->field($field)
->alias("a") ->alias("a")
->join('applies b','a.apply_id = b.id' ,'LEFT') ->join('applies b','a.apply_id = b.id' ,'LEFT')
->where($params) ->where($params)
->order($order_) ->order($order_)
->group("a.apply_id")
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
->select(); ->select();
......
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