Commit 9645d3c3 authored by clone's avatar clone

bug

parent c01db511
...@@ -1122,13 +1122,19 @@ class OrderLogService ...@@ -1122,13 +1122,19 @@ class OrderLogService
$filed = "a.id,a.father_id,a.house_number,a.commission,a.agent_id,a.create_time,b.user_phone,b.user_name,b.user_id,c.id as order_id, $filed = "a.id,a.father_id,a.house_number,a.commission,a.agent_id,a.create_time,b.user_phone,b.user_name,b.user_id,c.id as order_id,
d.id as house_id,d.internal_title,d.internal_address"; d.id as house_id,d.internal_title,d.internal_address";
$result = $bargainModel->selectBargainList($filed, $params, $pageNo, $pageSize); $result = $bargainModel->selectBargainList($filed, $params, $pageNo, $pageSize);
$list = [];
foreach ($result as $k => $v) { foreach ($result as $k => $v) {
if($v["father_id"] > 0){ $father_id = $v["father_id"];
if($father_id > 0 && in_array($father_id, $list)){
unset($result[$k]);
}else{
$result[$k]["create_time"] = date("Y-m-d", strtotime($v["create_time"]));
$result[$k]["id"] = $v["father_id"]; $result[$k]["id"] = $v["father_id"];
array_push($list,$father_id);
} }
$result[$k]["create_time"] = date("Y-m-d", strtotime($v["create_time"]));
} }
return $result; return ;
} }
......
...@@ -221,12 +221,11 @@ class OBargainModel extends Model ...@@ -221,12 +221,11 @@ 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_)
->group("a.father_id")
->order("a.create_time desc") ->order("a.create_time desc")
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
->select(); ->select();
//echo $this->db_->getLastSql(); // echo $this->db_->getLastSql();
return $result; 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