Commit 47c97555 authored by clone's avatar clone

1

parent 45a2bcc4
...@@ -237,7 +237,7 @@ class OBargainModel extends Model ...@@ -237,7 +237,7 @@ class OBargainModel extends Model
*/ */
public function selectBargainList($filed, $params, $pageNo, $pageSize) public function selectBargainList($filed, $params, $pageNo, $pageSize)
{ {
$where_ = []; $where_ = $whereOr_ = [];
if (isset($params["status"])) { if (isset($params["status"])) {
$where_["a.status"] = $params["status"]; $where_["a.status"] = $params["status"];
...@@ -246,7 +246,7 @@ class OBargainModel extends Model ...@@ -246,7 +246,7 @@ class OBargainModel extends Model
$where_["a.agent_id"] = array("in", $params["ids"]); $where_["a.agent_id"] = array("in", $params["ids"]);
} }
if (isset($params["submit_agent_id"])) { if (isset($params["submit_agent_id"])) {
$where_["a.submit_agent_id"] = $params["submit_agent_id"]; $whereOr_["a.submit_agent_id"] = $params["submit_agent_id"];
} }
if (isset($params["account_statement"])) { if (isset($params["account_statement"])) {
...@@ -294,6 +294,7 @@ class OBargainModel extends Model ...@@ -294,6 +294,7 @@ class OBargainModel extends Model
->join("o_order c", "a.order_id = c.id", "left") ->join("o_order c", "a.order_id = c.id", "left")
->join("g_houses d", "c.house_id = d.id", "left") ->join("g_houses d", "c.house_id = d.id", "left")
->where($where_) ->where($where_)
->whereOr($whereOr_)
->order("a.create_time desc") ->order("a.create_time desc")
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
......
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