Commit 5dadeac4 authored by clone's avatar clone

bug

parent b83294a2
......@@ -681,7 +681,7 @@ class OBargainModel extends Model
$where_["a.trade_type"] = 10;
//$where_["a.father_id"] = 0;
array_push($join,[' o_report c','a.report_id=c.id','left']);
array_push($join, [ ' o_report c', 'a.report_id=c.id', 'left' ]);
}
......@@ -698,7 +698,7 @@ class OBargainModel extends Model
if (isset($params["house_ids"])) {
$where_["b.house_id"] = array( "in", $params["house_ids"] );
array_push($join,[' o_order b','a.order_id = b.id','left']);
array_push($join, [ ' o_order b', 'a.order_id = b.id', 'left' ]);
}
$return = Db::table($this->table)
......@@ -793,6 +793,7 @@ class OBargainModel extends Model
if (isset($params["agent_id"])) {
$where_["c.report_agent_id"] = $params["agent_id"];
$where_["a.agent_id"] = $params["agent_id"];
}
if (isset($params["create_time"])) {
$where_["a.create_time"] = $params["create_time"];
......@@ -1197,7 +1198,7 @@ class OBargainModel extends Model
* @param string $order
* @return false|\PDOStatement|string|\think\Collection
*/
public function getTotalByAgentId($field ,$params, $type ,$order = "")
public function getTotalByAgentId($field, $params, $type, $order = "")
{
$group_ = "";
switch ($type) {
......@@ -1215,7 +1216,7 @@ class OBargainModel extends Model
$result = $this->db_
->field($field)
->alias("a")
->join("a_agents b","a.agent_id = b.id","left")
->join("a_agents b", "a.agent_id = b.id", "left")
->where($params)
->group($group_)
->order($order)
......
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